]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'ready/more-magic'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)
commitea2ab6f885b97081c37f9034d8b7e12a0e34ad3e
treea0b46dc980c8b96bfc5b35a7691d261cde586cf9
parent303f183d45a3095859dd453339cc5565bd1b8074
parent77a2267dcfb103b63a675e4a2226076166b29d3f
Merge branch 'ready/more-magic'