Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 1 Feb 2014 16:25:39 +0000 (17:25 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 1 Feb 2014 16:25:39 +0000 (17:25 +0100)
commit2f40216fad9c29aa622b160f39efbdf0301fe307
treea51a746312fec0e0cc603e7440166da791f4f937
parentcddeef09903f565d37621edba4fa3dc671b8bcc2
parent71b235551eca7335c5f9a1fc5e5dc5efd8472a4e
Merge branch 'master' into orm
test/test_config_api.py