]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'ready/edittemplate2'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)
commit390f12a845e65e30ce3c189d62dc4ca8c637e3f0
treeb0ea0cabcaed3b6d89b22eb4425b375b58008f9e
parent70a48576246c62746a7307f434438af0b6e9b755
parent26d62b386ec0a2ee8f0c00cf48ccc21a8213063b
Merge branch 'ready/edittemplate2'