]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '6a1cbe6f09e20ead8393de184480a403bc20cda1' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:57:03 +0000 (00:57 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:57:03 +0000 (00:57 -0500)
commit20e37d93139e2d536b39e29c545d8ad3f52ffd63
treed7813c2b300bf456ec076f93bcddc6756782ab8a
parent7e0d4b422d97a7c8cdb196e86df9869d2cbf88be
parent6a1cbe6f09e20ead8393de184480a403bc20cda1
Merge commit '6a1cbe6f09e20ead8393de184480a403bc20cda1' into sipb

Conflicts:
templates/page.tmpl