Merge branch 'no-cleartext-passwords-in-db'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jun 2011 08:27:25 +0000 (10:27 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jun 2011 08:27:25 +0000 (10:27 +0200)

Trivial merge