commit | d27c20a6c1d7c82322ce9dc89339ba6236bb1cb1 | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 21:35:04 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 21:35:04 2012 +0200 |
tree | 725a4832ea04d62b303a58ab1edf186562739227 | |
parent | 1de34fffad39f4c31516ef75e0d6552ef587aeae [diff] | |
parent | b211adee89f5fd2192051e9c0826146bd150f469 [diff] |
Merge remote-tracking branch 'upstream/develop' into develop-db-postgre