Hipster Hitman 092ef8f389 Merge branch 'master' of github.com:magnolia-fan/BeatHaven ... Conflicts: rails/app/views/artist/view.rhtml rails/config/routes.rb rails/public/stylesheets/beathaven.css		2011-04-09 17:31:13 +04:00
..
view.rhtml	Merge branch 'master' of github.com:magnolia-fan/BeatHaven	2011-04-09 17:31:13 +04:00