Christopher Tate c45ff35f21 am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
  Adapt to underlying changes in the PBKDF2 implementation
2014-03-05 00:57:22 +00:00
..
2013-05-24 16:36:14 -07:00
2013-04-08 19:02:01 -07:00
2013-07-29 16:30:04 +00:00