Merge remote-tracking branch 'remotes/origin/1636-inactive-user' into 1678-new-user...
authorPeter Amstutz <tetron@cosmos>
Fri, 27 Dec 2013 01:38:22 +0000 (20:38 -0500)
committerPeter Amstutz <tetron@cosmos>
Fri, 27 Dec 2013 01:38:22 +0000 (20:38 -0500)
commit1944f82913c0a19254a136bf79bc353e762267e1
treed7672e997d53d5be709ee8d6916e3d6bea5fabbf
parentbab3fc9161233635d5d64d1ad37b79efac6a4313
parent5416a457a781c7bdd3797a9bfbaf1750fc4f3168
Merge remote-tracking branch 'remotes/origin/1636-inactive-user' into 1678-new-user-orientation-pete-wfh

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/users/home.html.erb
doc/user/getting_started/workbench.textile