Dmitriy Zaporozhets b8ca1d62c4 Merge branch 'dev' ... Conflicts: app/assets/images/ajax-loader.gif public/favicon.ico		2011-11-06 21:07:56 +02:00
..
images	Merge branch 'dev'	2011-11-06 21:07:56 +02:00
javascripts	Merge branch 'dev'	2011-11-06 21:07:56 +02:00
stylesheets	Merge branch 'dev'	2011-11-06 21:07:56 +02:00