Merge branch 'horde-git' (since 12/23/2009) into master
authorMichael M Slusarz <slusarz@curecanti.org>
Tue, 12 Jan 2010 23:47:49 +0000 (16:47 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Tue, 12 Jan 2010 23:47:49 +0000 (16:47 -0700)
commit52f06b233e745178d33864c490ccecd0bd501458
tree10b23faa9837f2cfb4366b8cbe352e1ecf64e19f
parenta8629432eb42a7f3cf9f010f5fba52a6583648bd
parent1a310b2de34193b3f984e4506d87b32de412a65e
Merge branch 'horde-git' (since 12/23/2009) into master

Conflicts:
.gitattributes
.gitignore
.gitattributes