Christopher Tate 777b8a808e am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '422b2656741520448815b230f7c73ad67a4c4e95':
  Adapt to underlying changes in the PBKDF2 implementation
2014-03-05 22:17:21 +00:00
..
2013-05-24 16:36:14 -07:00
2013-07-29 16:30:04 +00:00