]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:33:02 +0000 (15:33 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:33:02 +0000 (15:33 -0400)
commita568e0458eb4636c75d266a29a823445415c8cd0
tree33ea980d6ce4adb15b979de7e036d28fa81f8fb2
parent6c5e24f2a16a7e2ba6c46d231d5c5eaf31edd29b
parentb092831d8577b4c31125994786154510396e884e
Merge branch 'master' of ssh://git.ikiwiki.info