Merge remote-tracking branch 'alexis/lib-jvm'
authorJean Privat <jean@pryen.org>
Fri, 14 Mar 2014 20:20:05 +0000 (16:20 -0400)
committerJean Privat <jean@pryen.org>
Fri, 14 Mar 2014 20:20:05 +0000 (16:20 -0400)
1  2 
tests/tests.sh

diff --cc tests/tests.sh
Simple merge