Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Mon, 3 Feb 2014 21:11:58 +0000 (22:11 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Mon, 3 Feb 2014 21:11:58 +0000 (22:11 +0100)
commit5646fc35a2517e5224f0ad1f3fbd73d513b5214e
tree9770d1dbe5fc57e6ccdb983d4b4736d334b1a132
parent58972314219547c1c2baf741e35d38f23f10a5be
parent8d10ad40022f35267a3edd7b2968cf784bfe93cf
Merge branch 'master' into orm

Conflicts:
test/test_parsing_group.py
test/test_config.py
test/test_config_api.py
test/test_parsing_group.py
tiramisu/config.py