wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. ... Updated migration date to today. Conflicts: db/schema.rb		2013-07-18 18:48:49 +02:00
..
user_notifier.rb	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00