Konstantin Haase 162c615919 Merge branch 'master' into rkh-mustermann ... Conflicts: Gemfile.lock		2014-12-01 12:43:11 +01:00
..
tasks	Rename encyrpt_all_data.rake to encrypt_all_data.rake	2014-06-19 17:52:03 -04:00
travis	Merge branch 'master' into rkh-mustermann	2014-12-01 12:43:11 +01:00