Merge branch 'release-0.6.7'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 17:17:58 +0000 (19:17 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 17:17:58 +0000 (19:17 +0200)
* release-0.6.7:
  release: fix up the CHANGELOG
  Update version after release of v0.6.7.1
  Release v0.6.7.1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

Trivial merge