Merge branch 'next' into feature/gts3-ui
authorChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 09:39:35 +0000 (10:39 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 09:39:35 +0000 (10:39 +0100)
commit08543372a9ece50b5948f3073ef47dbe1f13ea72
treebc6376908f162a71aad16d16d34b3b7e1baa08ca
parent768d4cca677be94958d30260e01966c89592ae34
parent4bd9f611a7978afd2cb0df1ac8e0c16478f2b574
Merge branch 'next' into feature/gts3-ui
app/helpers/application_helper.rb
config/application.rb