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)
commit5eaabd2822f2a9ba109db181c0b6b7fd536e35c0
tree72494bbebb6deb76f4ce32e6e394b8b32c19996e
parent687d5eb5a890ec7f3a9225d539bdb614da0c410d
parentc1a2eba490e37e1816cf41c258e94c5e2cbe95a3
Merge branch 'master' of git@github.com:fluffymormegil/libmormegil