Merge branch 'master' into debian

Conflicts:
	ykpersonalize.1

diff --cc ykpersonalize.1
index f01cae92b375784d4b79898b130c886b31f1a412,bf8b69e6f888965120d80192508053d27d19a311..fd00646c5a02cc65134024886bb965f476af3ecb
--- 1/ykpersonalize.1
--- 2/ykpersonalize.1
+++ b/ykpersonalize.1
@@@ -43,7 -43,8 +43,8 @@@ ykpersonalize - personalize Yubikey OT
  .PP
  Set the AES key, user ID and other settings in a Yubikey.  For the complete
  explanation of the meaning of all parameters, see the reference
- manual: http://static.yubico.com/var/uploads/pdfs/YubiKey_Manual_2010-09-16.pdf
 -manual:
 -.URL "http://yubico.com/files/YubiKey_manual-2.0.pdf" "Yubikey manual"
++manual: 
++.URL http://static.yubico.com/var/uploads/pdfs/YubiKey_Manual_2010-09-16.pdf "Yubikey manual"
  .TP
  \fB\-1\fR
  change the first configuration.  This is the default and is
@@@ -239,20 -246,10 +246,20 @@@ is pressed (although it is perfectly po
  configuration, and the other in challenge-response mode).  Instead, a program capable of
  sending USB HID feature reports to the token must be used to send it a challenge, and
  read the response.
 -
 +.SH Modhex
 +Modhex is a way of writing hex digits where the \(lqdigits\(rq are
 +chosen for being in the same place on most keyboard layouts.  To
 +convert from hex to modhex, you can use
 +.RS
 +tr "[0123456789abcdef]" "[cbdefghijklnrtuv]"
 +.RE
 +To convert the other way, use 
 +.RS
 +tr "[cbdefghijklnrtuv]" "[0123456789abcdef]"
 +.RE
  .SH BUGS
  Report ykpersonalize bugs in 
- .URL "http://code.google.com/p/yubikey-personalization/issues/list" "the issue tracker"
+ .URL "https://github.com/Yubico/yubikey-personalization/issues" "the issue tracker"
  .SH "SEE ALSO"
  The 
  .URL "http://code.google.com/p/yubikey-personalization/" "ykpersonalize home page"