Merge remote-tracking branch 'lucas/ropes'
authorJean Privat <jean@pryen.org>
Mon, 9 Sep 2013 17:09:51 +0000 (13:09 -0400)
committerJean Privat <jean@pryen.org>
Mon, 9 Sep 2013 17:09:51 +0000 (13:09 -0400)
commit06eb640589d793a91fb7c332c9e80c3e7d754272
tree50f4fd644ab6834f937575784bfa20988a8c4495
parentfefc0152295ff63b11ecac0fdf63ba798718cd42
parent9fa18aed883fc32abec68c9952f19d234ca69571
Merge remote-tracking branch 'lucas/ropes'

Conflicts:
lib/standard/standard.nit
lib/standard/standard.nit