]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'smcv/master'
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 16:02:57 +0000 (12:02 -0400)
commitf707d62481052a3cba1396a681f206d9e66f67ef
tree8a50f5082a1c815ca31ff31aacda62527e97a437
parentd101269bde7eb2d3497b8fe9e6cc6e78aec4663c
parent1f26a1bf1655b1d0223b24ba1db70579a3774eb1
Merge commit 'smcv/master'