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)
commit49edb2f365c78df40996baf53a984d8674978223
treeb0a1acaef9cc736cb6531bd05afb1758e44c74f6
parentb436236431c1c97b0fa90802393debd91192897a
parent71f6f666a3d69c6e1e7a77e238362c5bbe288e66
Merge tag 'upstream/0.3.5'

Upstream version 0.3.5