Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
authorBen Klang <ben@alkaloid.net>
Mon, 6 Apr 2009 03:48:00 +0000 (23:48 -0400)
committerBen Klang <ben@alkaloid.net>
Mon, 6 Apr 2009 03:48:00 +0000 (23:48 -0400)
commitc2528cfac3845221f33742dd59fea6367b48c6bd
tree1c815c144c9bf0fee9a9c0162adc8d2156b9cdef
parent07a7c4bf4b13f99ebf5b45a0db53c4d8d16b36fd
parente74679fb6951926f21932953573928ea482b8350
Merge branch 'master' of ssh://dev.horde.org/horde/git/horde