Merge with 'origin/master' to resolve conflicts with #932 (stream)
authorJean Privat <jean@pryen.org>
Sat, 13 Dec 2014 15:59:16 +0000 (10:59 -0500)
committerJean Privat <jean@pryen.org>
Sun, 14 Dec 2014 02:24:09 +0000 (21:24 -0500)
commit4e51f81ec3dc7083272f1d107f79c30031e58f7d
tree6f26e39a44e979b16bd22d14ad7d2402954231ea
parent152806727d13fbd5831a0fee0ec630418cdfc273
parent969e147dafb6ccbcf2404b972a7e80a78081b85f
Merge ... 'origin/master' to resolve conflicts with #932 (stream)

Conflicts:
lib/standard/stream.nit
lib/standard/string.nit
src/nitls.nit
tests/sav/test_exec.res
lib/standard/stream.nit
src/nitls.nit