Merge remote-tracking branch 'origin/kuadrosx-experimiental'
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 7 Aug 2011 23:28:50 +0000 (18:28 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 7 Aug 2011 23:28:50 +0000 (18:28 -0500)
commit2e714451e47e83c94984fb3508e0ca028112b843
tree71f4d82e2d08d11e0d5b54ba4990de290f360aaf
parent5a96faed6b0e8cb3c66fdfb4c58748ca3b4e9f3e
parent4e1097fadaeb1226b06f941cd078c2a7341ea688
Merge remote-tracking branch 'origin/kuadrosx-experimiental'
app/stylesheets/app/content/_main.sass
public/javascripts/app/modules/ui.js