Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:32:30 +0000 (15:32 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:32:30 +0000 (15:32 -0400)
commit95bfa99e2abf9d717f0eb42891f3175edcb7a8e5
treec51b6775087b3d606d140a09b330eb3602582442
parent229ca60acb0ed571c471b32cabd4c9f337a6622d
parent252071a20fdb71da6faf54601d8f56a4ddb4f90f
Merge branch 'master' of ssh://git.ikiwiki.info
doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn