Merge remote branch 'js/redesign'
authorOle Martin Kristiansen <ole@shortcut.no>
Tue, 11 May 2010 13:41:49 +0000 (15:41 +0200)
committerOle Martin Kristiansen <ole@shortcut.no>
Tue, 11 May 2010 13:41:49 +0000 (15:41 +0200)
commit95fc59eb053896c1622371f222fa2763b6e718b4
tree788c0be67b9313dfc5d4c2746b58389dffdbdb9b
parentdff20008ef081c3569440ccf6ad7b60bcf495af5
parentdc1db6d5e894993437ea17074a81bb7530951361
Merge remote branch 'js/redesign'

Conflicts:
app/views/layouts/application.html.erb
public/stylesheets/base.css