Merge tag 'upstream/0.1.4'
authorgregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:54:56 +0000 (21:54 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:54:56 +0000 (21:54 +0100)
commitefd70bf4679d6e7fa279b7ffe5cf17b2d47f2dd5
tree31e7ab05bc19dcb961a9f1ca8031e5fb703a5a81
parent3de7df9d24762336d3225d4d0706f288a3219132
parentb022cde640c3b85dd72895886bcb5c98be7b7a37
Merge tag 'upstream/0.1.4'

Upstream version 0.1.4