tree 4eae75f0caff908c82fbe3fef25db9216738645b
parent 5ac6999c87cbca07aa2b0bfa972bac218600b404
parent d8a0aed00b2174af5cac96ecada10ea392e19120
author Andrey Andreev <narf@bofh.bg> 1330378114 +0200
committer Andrey Andreev <narf@bofh.bg> 1330378114 +0200

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