Merge branch 'master' of ssh://git.onelab.eu/git/transforward
authorThomas Dreibholz <dreibh@simula.no>
Thu, 24 Jul 2014 09:06:38 +0000 (11:06 +0200)
committerThomas Dreibholz <dreibh@simula.no>
Thu, 24 Jul 2014 09:06:38 +0000 (11:06 +0200)

Trivial merge