Merge remote-tracking branch 'origin/higherhits'
authorAnders <mortberg@chalmers.se>
Mon, 20 Apr 2015 14:03:29 +0000 (16:03 +0200)
committerAnders <mortberg@chalmers.se>
Mon, 20 Apr 2015 14:03:29 +0000 (16:03 +0200)

Trivial merge