Merging with upstream
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Sat, 5 Feb 2011 16:43:45 +0000 (11:43 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Sat, 5 Feb 2011 16:43:45 +0000 (11:43 -0500)
commit4b57f868cd1cc7d2d72d5a49bd7c6195bc288b5b
tree0312c6ce119bcbe31dca26c134c5f93e9d213624
parent42b2d64338f7cc5a2d5a8369948f05ec8783d295
parent7b010b27d5e12eec990ebbd714bb9cda08c0b600
Merging with upstream

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
app/stylesheets/app/_basics.sass
app/views/layouts/application.html.haml
app/views/shared/_user-zone.html.haml