[ckan-changes] [okfn/ckan] 639e5a: [merge]

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan

  Commit: 639e5a5dbedd124fe67c90f6314067a4a13ecdc1
      https://github.com/okfn/ckan/commit/639e5a5dbedd124fe67c90f6314067a4a13ecdc1
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/model/user.py
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [merge]