Merge branch '2681-new-inactive-user-notification'
authorWard Vandewege <ward@curoverse.com>
Mon, 2 Jun 2014 19:17:44 +0000 (15:17 -0400)
committerWard Vandewege <ward@curoverse.com>
Mon, 2 Jun 2014 19:17:44 +0000 (15:17 -0400)
commitf6235f6bbe13b61b298d07bedb75ba645d69ed15
treed0099abbce56e74328478dadc006adad312719c4
parentcce25fdb29b36ffa3348546da36cbd4d8bbfe4fc
parentaa58b06d72a858fd63e091622a5bd8b3a9287e72
Merge branch '2681-new-inactive-user-notification'

refs #2681