Merge master to resolve conflict in tests not present yet
authorJean Privat <jean@pryen.org>
Wed, 2 Jul 2014 05:54:26 +0000 (01:54 -0400)
committerJean Privat <jean@pryen.org>
Wed, 2 Jul 2014 05:54:26 +0000 (01:54 -0400)
commit32227a5667151194b4f188555e9638d4ffbd7c9e
tree5b83961384da1a8cdf7631164833bc059903c984
parent4d3f0bd8899facbe8fda95b28eb667540d9d3587
parentc4b5f148813a2b2eb0d2614f2f744fc6e2102834
Merge master to resolve conflict in tests not present yet
tests/tests.sh