Merge remote branch 'horde/master' into horde-upstream
authorJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:10:30 +0000 (18:10 +0100)
committerJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:10:30 +0000 (18:10 +0100)
commitccfe171bb1616f668a2942d93ab134192788a082
tree13998280b0a7a926f6d9421e2b253b10ed0c21ac
parent5ba3fa5fe7fd0f805088dcd64c0d37205a5d51f2
parent41fe1806ff7cc73f565526615706f33100f4f7f7
Merge remote branch 'horde/master' into horde-upstream