Merge branch 'master' of git@github.com:fluffymormegil/libmormegil
authorMartin Read <mpread@chiark.greenend.org.uk>
Sat, 23 Oct 2010 21:36:52 +0000 (22:36 +0100)
committerMartin Read <mpread@chiark.greenend.org.uk>
Sat, 23 Oct 2010 21:36:52 +0000 (22:36 +0100)

Trivial merge