Merge branch 'proto' into re6st-slapos
authorAlain Takoudjou <talino@tiolive.com>
Tue, 14 Apr 2015 14:25:03 +0000 (16:25 +0200)
committerAlain Takoudjou <talino@tiolive.com>
Tue, 14 Apr 2015 14:25:03 +0000 (16:25 +0200)
commit63a812b1719b924b4ad7140687b568e7e7fd1b73
treedb256879a19ad26f6cc3f82830a25c48beceb47a
parente70bead521b3e8747865b089124a71d54988da16
parentabae0b5d4df37157b56859164f5479b07587d7c9
Merge branch 'proto' into re6st-slapos
re6st-conf
re6st/registry.py