Merge pull request #513 from kiilerix/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 24 Mar 2012 01:25:15 +0000 (18:25 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 24 Mar 2012 01:25:15 +0000 (18:25 -0700)
a crypto+redirect fix and manu small steps with locale / keyboard refactoring


Trivial merge