Merge branch '1636-inactive-user' into 1678-new-active-user-orientation
authorPeter Amstutz <peter.amstutz@clinicalfuture.com>
Fri, 27 Dec 2013 13:43:14 +0000 (08:43 -0500)
committerPeter Amstutz <peter.amstutz@clinicalfuture.com>
Fri, 27 Dec 2013 13:43:14 +0000 (08:43 -0500)
commite159519053a0f74c96a596ae78f3587bb98ebd09
treece9770b45aebb30ae29edea149f4ca0b88616b78
parentab3f9742f002e3af4339c17eede2b6ee99df83b2
parent5416a457a781c7bdd3797a9bfbaf1750fc4f3168
Merge branch '1636-inactive-user' into 1678-new-active-user-orientation