Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications ... Conflicts: config/locales/ru.yml		2012-01-31 21:42:37 +06:00
..
notifiers_controller.rb	Merge branch 'master' into 114-comment_notifications	2012-01-31 21:42:37 +06:00