Merge remote-tracking branch 'alexis/sort_downloads'
authorJean Privat <jean@pryen.org>
Wed, 21 Aug 2013 01:13:48 +0000 (21:13 -0400)
committerJean Privat <jean@pryen.org>
Wed, 21 Aug 2013 01:13:48 +0000 (21:13 -0400)
commit6f232ae3f2ed898966057f7064bca1bb9707424a
treea4c531ce6b6f2709024cd7e8a598ed6c26671761
parentc4bb9b7724f5b4ea35e3c8b49fa7d92f7a974d95
parent9d6a0df112df22da570ba5895a52e4cd7a1084a4
Merge remote-tracking branch 'alexis/sort_downloads'

Conflicts:
lib/standard/collection/abstract_collection.nit
tests/testfull.sh
lib/standard/collection/abstract_collection.nit
lib/standard/file.nit
lib/standard/string_search.nit
tests/testfull.sh