Merge tag 'upstream/0.1.4'
authorgregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:51:50 +0000 (21:51 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:51:50 +0000 (21:51 +0100)
commit924557be8dc2b54fefd9ef4687ab6e8001fdb9b8
tree7e9c2a87bacf88a5baafcd3c6922d0a5b6ed53e1
parent0ff3daf00207e2ee20143f3c566963cb755a67c8
parent70991a39977b362e3cc7fc88f2815486b09b655f
Merge tag 'upstream/0.1.4'

Upstream version 0.1.4