]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 23:44:54 +0000 (16:44 -0700)
committerJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 23:44:54 +0000 (16:44 -0700)
commitc137ef31026a5de929251f6c5a747df5ac24763d
treeb854a5866ad510375ad33dff1a2af4a4bf02776a
parent16a8a0e1e29e2ab197012972230760d0e71412fb
parentc0324124f764f433ac5672ee7e498f074c28322f
Merge branch 'master' of ssh://git.ikiwiki.info