tree 725a4832ea04d62b303a58ab1edf186562739227
parent 1de34fffad39f4c31516ef75e0d6552ef587aeae
parent b211adee89f5fd2192051e9c0826146bd150f469
author Andrey Andreev <narf@bofh.bg> 1328211304 +0200
committer Andrey Andreev <narf@bofh.bg> 1328211304 +0200

Merge remote-tracking branch 'upstream/develop' into develop-db-postgre