Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@horde.org>
Wed, 3 Nov 2010 14:08:20 +0000 (14:08 +0000)
committerJan Schneider <jan@horde.org>
Wed, 3 Nov 2010 14:08:20 +0000 (14:08 +0000)
commitf02268449b7c6693df5a68e6c34a19edff352494
tree17c173ec847fb68d59608bfdc82965f74c8edeb8
parent408510415b8856dca4cb0c3aa7b4ee9b5ef9d0a0
parent67133536173f483559595a93794f0d5b684d5b0b
Merge branch 'master' of /horde/git/horde