Resolve merge conflict from master
authorChristian Johansen <christian@gitorious.org>
Mon, 11 Jul 2011 11:36:30 +0000 (13:36 +0200)
committerChristian Johansen <christian@gitorious.org>
Mon, 11 Jul 2011 11:36:30 +0000 (13:36 +0200)
commit854e06124170ff52d5edd138b41fb262176e1f1d
treea79de34771c8f2a6b6687199e3959b8f79a6d76a
parent9db5aafeb3c69c0b67000fb740a9a65e750e5047
parentff74db738a0d8dc0fa00dab8a51ddaff6a7296e8
Resolve merge conflict from master
Gemfile
Gemfile.lock
test/test_helper.rb