Merge tag 'upstream/1.9.5'
authorBalint Reczey <balint@balintreczey.hu>
Thu, 24 Jul 2014 05:23:07 +0000 (07:23 +0200)
committerBalint Reczey <balint@balintreczey.hu>
Thu, 24 Jul 2014 05:23:07 +0000 (07:23 +0200)
Upstream version 1.9.5

# gpg: Signature made Thu 24 Jul 2014 07:23:02 AM CEST using RSA key ID B4691A7D
# gpg: Good signature from "Balint Reczey <balint@balintreczey.hu>"


Trivial merge