Merge branch 'master' of git.rot13.org:/git/MojoFacets
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 26 May 2011 12:40:29 +0000 (14:40 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 26 May 2011 12:40:29 +0000 (14:40 +0200)

Trivial merge