Merge tag 'upstream/0.3.5'
authorMichael Prokop <mika@grml.org>
Fri, 29 Aug 2014 20:45:10 +0000 (13:45 -0700)
committerMichael Prokop <mika@grml.org>
Fri, 29 Aug 2014 20:45:10 +0000 (13:45 -0700)
Upstream version 0.3.5


Trivial merge