Merge remote-tracking branch 'refs/remotes/origin/227' into merge-requests/227
authorChristian Johansen <christian@gitorious.com>
Wed, 30 Jan 2013 09:17:00 +0000 (10:17 +0100)
committerChristian Johansen <christian@gitorious.com>
Wed, 30 Jan 2013 09:17:00 +0000 (10:17 +0100)
commit6577e90c70b40acc4a1e04744aa4ca7d6c938a76
treeaf5b7e3edf3ad2322e211b128d26bb2cfc9d4f61
parent3330406c796caa1f389d4cb58fe523be2a0d6a1a
parentbf451b5becb911dbc442120dac48f12a289ae809
Merge remote-tracking branch 'refs/remotes/origin/227' into merge-requests/227

Conflicts:
Gemfile
Gemfile
Gemfile.lock