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)
1  2 
test/test_config_api.py

Simple merge