Merge remote-tracking branch 'ui/ui' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 30 Mar 2011 21:27:31 +0000 (16:27 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 30 Mar 2011 21:27:31 +0000 (16:27 -0500)
commit2f74caada8e5008ae1096bcb09c5c3c33857107f
tree7429ee8c4b92a5fd91b164d829584bb05c97dc99
parentd324048f5a67ad1370191489d5e99018c61bd919
parent8ffa3a7a9cc03dc47b2779703415e4f5b5293089
Merge remote-tracking branch 'ui/ui' into next
app/views/layouts/application.html.haml