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)
commit16d6d6336bacbd1d34ab100a6acf38bbac0dcaeb
treee34ca7e41ab3325cc4d45088fd5646a20859b5a1
parent60833b32880b73ca94a18c872a8bd1316e7ab4f5
parent09f391c332888c9c32ab70bf17a485b29d03e8bb
Merge branch 'horde-upstream'
kronolith/templates/index/index.inc