Merge branch 'release-0.6.8'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 29 Dec 2014 12:01:55 +0000 (13:01 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Mon, 29 Dec 2014 12:01:55 +0000 (13:01 +0100)
* release-0.6.8:
  Update version after release of v0.6.8
  Release v0.6.8

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

Trivial merge