Merge config files (#1487311). Now we have defaults.inc.php and config.inc....

Aleksander Machniak

2013-06-14 461a30d771edd8bc6606f2c92dfde363514b93b1

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