summaryrefslogtreecommitdiff
path: root/page.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-02 09:46:34 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-02 09:46:53 +0200
commit0f3696a30b077a244ab337b924c73ae46034d88a (patch)
treeadc0d32fb326a2c91a5eddd09f24f2827d8a251c /page.tmpl
parent4fb9600af4d836e61a341531507380465b715226 (diff)
parent03dddc72f595befbd6322dd32da6b4fcc3b2d1f1 (diff)
Merge branch 'master' into master-da
Conflicts (manually resolved): atomitem.tmpl atompage.tmpl estseek.conf Also dropped the following (changed earlier than 2.56 but missed): estseek.conf estseek.help
Diffstat (limited to 'page.tmpl')
0 files changed, 0 insertions, 0 deletions