Merge branch 'master' into refactor-Kolab_Session
authorGunnar Wrobel <p@rdus.de>
Fri, 23 Oct 2009 17:10:08 +0000 (19:10 +0200)
committerGunnar Wrobel <p@rdus.de>
Fri, 23 Oct 2009 17:10:08 +0000 (19:10 +0200)
commitbc933f034e3d55fabff9c053a8ab4911cba554bd
tree27e64ed0bc09a6736534988a38358d96350eb256
parent5b87c45496250ff22a425aeaf00eb66150182acd
parentd3e5b4f90d1693f0b240a0105f4bfe0baf987974
Merge branch 'master' into refactor-Kolab_Session