Merge remote branch 'upstream/next' into ui
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Wed, 30 Mar 2011 21:09:04 +0000 (16:09 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Wed, 30 Mar 2011 21:09:04 +0000 (16:09 -0500)
commitd7c803e6408007793658883f6270d3e0efd39799
treed7a8edc137bc866c66594f61731572033ed9724f
parent8ffa3a7a9cc03dc47b2779703415e4f5b5293089
parent4bd4d9432e0d70f951a9fccc2d5082ceffb8e5be
Merge remote branch 'upstream/next' into ui
app/views/layouts/application.html.haml