Merge branch 'wip2'
authorJean Privat <jean@pryen.org>
Mon, 16 Apr 2012 20:26:03 +0000 (16:26 -0400)
committerJean Privat <jean@pryen.org>
Mon, 16 Apr 2012 20:26:03 +0000 (16:26 -0400)
commite296f83f7d8cb30b7b6f0f2864720321fad7b11d
treec6ba61aefc30a18f1190731506112fd687608eb2
parentaed01cc82f807eb4cc12db20702ac24e53441d2f
parentbf8b78b595dcc05313807a7bf288a89dbe218fdc
Merge branch 'wip2'

Conflicts:
tests/nitdoc.args
lib/standard/exec.nit
lib/standard/file.nit
lib/standard/stream.nit
lib/standard/string.nit
tests/nitdoc.args