-
Committer:
Sebastian Ramacher
-
Date:
2016-01-31 20:58:37 UTC
-
mfrom:
(1.2.39)
-
Revision ID:
git-v1:b7ac1de93ecf7cd3d86898544433974ce0af7086
Merge tag 'upstream/2.2.2'
Upstream version 2.2.2
# gpg: Signature made Sun 31 Jan 2016 21:57:53 CET using RSA key ID 6EA71993
# gpg: Good signature from "Sebastian Ramacher <sebastian@ramacher.at>"
# gpg: aka "Sebastian Ramacher <s.ramacher@gmail.com>"
# gpg: aka "Sebastian Ramacher <s.ramacher@gmx.at>"
# gpg: aka "Sebastian Ramacher <s.ramacher@student.tugraz.at>"
# gpg: aka "Sebastian Ramacher <sramacher@debian.org>"
# gpg: aka "Sebastian Ramacher <sebastian.ramacher@iaik.tugraz.at>"