Merged configuration refactoring from 'dev_config' branch back into master ...

Thomas Bruederli

2013-07-10 0703bfecd0b9efca36caee4f7b9c64c4135d57af

config/db.inc.php.dist does not exist in tree 98316de8bbc1da023b7da5863188171f08e6614e