-
Committer:
Stig Sandbeck Mathisen
-
Date:
2012-05-18 13:32:16 UTC
-
mfrom:
(385.1.96)
-
Revision ID:
git-v1:1ef210ec801e181684937ea717010a4d56064500
Merge tag 'upstream/1.6.9'
Upstream version 1.6.9
# gpg: Signature made Fri 18 May 2012 03:32:12 PM CEST using DSA key ID FA26E2EE
# gpg: Good signature from "Stig Sandbeck Mathisen <ssm@fnord.no>"
# gpg: aka "Stig Sandbeck Mathisen <ssm@debian.org>"
# gpg: aka "Stig Sandbeck Mathisen <stigsm@gmail.com>"
# gpg: aka "Stig Sandbeck Mathisen <ssm@linpro.no>"
# gpg: aka "Stig Sandbeck Mathisen <ssm@online.no>"
# gpg: aka "Stig Sandbeck Mathisen <ssm@redpill-linpro.com>"