Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:42 +0000 (15:12 +0000)
committerJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:42 +0000 (15:12 +0000)
commit5ba3fa5fe7fd0f805088dcd64c0d37205a5d51f2
treefe0302a1dbbdb067083980df8c7c7e039a7ef216
parent46e5d6759b6939a64672cc019160390d9be49fa8
parent01f34d51ca1fad8035c411e27cfcfc53de16cfb3
Merge remote branch 'horde/master' into horde-upstream