tree 2110bdaca5e9509147fbb5649584401e88845a61
parent 32bfad653e29e893e4ed3812fdc0294a05126c08
parent bae9b8ddb84c10652ab58949b5adb44de04d169e
author Steve Francia <steve.francia@gmail.com> 1430513897 -0400
committer Steve Francia <steve.francia@gmail.com> 1430513897 -0400

Merge pull request #16 from eparis/merge

Merge ogier/pflag and enable travis