Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 21:27:06 +0000 (21:27 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 21:27:06 +0000 (21:27 +0000)
commitac84279dca5d85dd2c4407131fc8565d5b56dc44
tree3d2bbdb7af102e3bec4bbf870931d267900bb308
parente57a0b54fe26acb1765dbee32736016b0d4ebbcc
parent46e5d6759b6939a64672cc019160390d9be49fa8
Merge branch 'horde-upstream'