Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 28 Oct 2010 10:08:47 +0000 (11:08 +0100)
committerJan <jan@horde.org>
Thu, 28 Oct 2010 10:08:47 +0000 (11:08 +0100)
1  2 
kronolith/templates/index/index.inc

Simple merge