Merge remote-tracking branch 'liuqiang/master'
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 1 Jul 2011 17:39:28 +0000 (12:39 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 1 Jul 2011 17:39:28 +0000 (12:39 -0500)
commite39f8eff64af3ad4ebebc4a339246a0cc4c307de
treeff79425e8a8569346fc91923b60e037824b20f91
parent1ba16c1a3d540f9bf0526f56e687c5c11f8707de
parent627d8b26f3e3c883b3256db20a48af800bab5fda
Merge remote-tracking branch 'liuqiang/master'
config/assets.yml