]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:56:30 +0000 (10:56 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:56:30 +0000 (10:56 -0400)
commit4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c
tree0356d73eaa506564ec536f12cda31b2fb95a817b
parentb5a7e156d1bec925ca149fd9a85f4521fa9b1111
parent72cde6d41923f0a43dba6b227d5efbfd4e2f600d
Merge branch 'master' of ssh://git.ikiwiki.info