Merge branch 'master' of git.rot13.org:/git/MojoFacets
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 11 Aug 2012 14:12:43 +0000 (16:12 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 11 Aug 2012 14:12:43 +0000 (16:12 +0200)

Trivial merge