Merge branch 'bundler'
authorChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:13:48 +0000 (13:13 +0100)
committerChristian Johansen <christian@shortcut.no>
Fri, 4 Mar 2011 12:13:48 +0000 (13:13 +0100)
commitfff2ffef2e8e589028950b34f9833a695626c80d
tree12c70180bc8491c635a93e5220f2f795e10d9c92
parent1044ff0339055857c97377f9ec113469e6dc03f6
parent68bdc6eae378fe51335ae6897bc1da25ba5afac8
Merge branch 'bundler'