]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' into revert
authorJoey Hess <joey@kitenet.net>
Tue, 5 Oct 2010 15:29:44 +0000 (11:29 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 5 Oct 2010 15:29:44 +0000 (11:29 -0400)
commit06b28dddecce8d27c0b556c883b8721aee1d3dc9
tree69451a53b452729420a1674535d934eaebb89d77
parentfe582418d21f8b619db872b84bc718459325bd15
parent46a98c8a4d72e8be0fd5e683a83745d529b2c3c3
Merge branch 'master' into revert

Conflicts:
doc/todo/web_reversion.mdwn