Merge branch 'master' of dev.horde.org:/horde/git/horde
authorJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 21:13:41 +0000 (22:13 +0100)
committerJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 21:13:41 +0000 (22:13 +0100)
commit83f40d119ef7dd8b03ed40eb331ffe66b64b33fd
tree5875f820a2551e29b31b40e8a43c3c1586782deb
parentc0c18d9da665ed80cbfe207e7b5797b46e4f1afd
parent87af97050871689bc86c162bc8886f92e8422172
Merge branch 'master' of dev.horde.org:/horde/git/horde

Conflicts:
horde/scripts/sql/horde_histories.mssql.sql
horde/scripts/sql/horde_histories.pgsql.sql
framework/History/package.xml