Merge remote-tracking branch 'origin/new-ui-pat' into new-ui
authorJorge Cuadrado <kuadrosxx@gmail.com>
Wed, 1 Feb 2012 05:27:18 +0000 (00:27 -0500)
committerJorge Cuadrado <kuadrosxx@gmail.com>
Wed, 1 Feb 2012 05:27:18 +0000 (00:27 -0500)
commite003e094701cc97f2b1726ee8756d7c9b3c15480
tree5eb9bc317ae3ef5c8bb1bb58ca418eed2cf64534
parentc0255c382d8a07de462acbc88826b5df5ff0cee2
parent25eeb768b8f843c794edc0fd60471d5eb7e50552
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

Conflicts:
app/assets/stylesheets/helper/items.css.sass
app/assets/stylesheets/helper/items.css.sass