Merge branch 'master' of ssh://simulacrum.blackswordsonics.com/~martin/libmormegil
authorfluffymormegil <mpread@chiark.greenend.org.uk>
Sat, 10 Mar 2012 19:28:38 +0000 (19:28 +0000)
committerfluffymormegil <mpread@chiark.greenend.org.uk>
Sat, 10 Mar 2012 19:28:38 +0000 (19:28 +0000)

Trivial merge