wvengen 4239843b3e Merge foodcoop1040:order_message into master ... Conflicts: plugins/messages/app/models/message.rb		2015-04-10 18:30:54 +02:00
..
message.rb	Merge foodcoop1040:order_message into master	2015-04-10 18:30:54 +02:00