]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 14 Dec 2011 21:01:21 +0000 (17:01 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 14 Dec 2011 21:01:21 +0000 (17:01 -0400)
commitfbedf85587d632976071788dec9de374494480fb
tree01d2f26131a16427778c3bbbbb7d1be387fd3bf5
parent8eec88bd7ccd4b900e96bc2db0c29224dcf5399b
parentbf127ccb24c44a0bac9f70fd644dbe2a7376e32c
Merge branch 'master' of ssh://git.ikiwiki.info