Get rid of merge commits in the changelog
Create Release: rel2014_06_20.19.26.40
Merge pull request #126 from fmarier/new-release

New release