Merge branch 'feature/rails3' into next
authorChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 09:04:37 +0000 (10:04 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 4 Jan 2013 09:04:37 +0000 (10:04 +0100)
commit4bd9f611a7978afd2cb0df1ac8e0c16478f2b574
tree54a45b38e3880c2ad7afaff931ff1baca12ecc73
parent150012d8e5efbdb73c4b2cb9f344a989b81d2e8e
parent9edbb51e86270cfdc1024a3547b2fbdd5e4d8874
Merge branch 'feature/rails3' into next