Merge remote-tracking branch 'derek-moore/bug293_non_ascii_password'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:19:03 +0000 (18:19 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:19:03 +0000 (18:19 -0500)

Trivial merge