use -m flag for GitRepo.pdiff() call

Without -m, diff-tree does not show any output for merge commits.
Merge pull request #8 from OEP/send-upstream

use -m flag for GitRepo.pdiff() call
parse_isodate(): fix issue #9, incorrect year
Merge branch 'develop' into fix-hg-log