Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Sat, 17 Apr 2010 04:57:51 +0000 (00:57 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Sat, 17 Apr 2010 04:57:51 +0000 (00:57 -0400)
Conflicts:
beertarium


Trivial merge