Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 1 Feb 2014 15:49:29 +0000 (16:49 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 1 Feb 2014 15:49:29 +0000 (16:49 +0100)
commitcddeef09903f565d37621edba4fa3dc671b8bcc2
tree4a6d35ea2978e80d17508eb63a3ba5d9c775b70a
parent313b03b2462106fe54b603d2f46395823e8fd4a7
parentf48f3e754402169136b4beedf80c745f587226c9
Merge branch 'master' into orm
test/test_config_api.py