Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:57 +0000 (15:12 +0000)
committerJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:57 +0000 (15:12 +0000)
commitaab4ecb968c38b6d6198546ed20dfe49d67baeea
tree4d783436ebb3f6b092d30ea6ab7795edf0f1b87c
parentac84279dca5d85dd2c4407131fc8565d5b56dc44
parent5ba3fa5fe7fd0f805088dcd64c0d37205a5d51f2
Merge branch 'horde-upstream'