Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@horde.org>
Sat, 28 Aug 2010 09:43:57 +0000 (09:43 +0000)
committerJan Schneider <jan@horde.org>
Sat, 28 Aug 2010 09:43:57 +0000 (09:43 +0000)
commit52fb6617fbc5735adb238856a20c0c4a91745405
treeaf9d6240d416157a7259c031e77926aa06d2ef90
parent445f0481630d044ae634cafc70fc65172d5aa704
parentefb2a163929eb75d2ef28db2a7db8f2fea018ea1
Merge branch 'master' of /horde/git/horde