Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 5 insertions, 0 deletions

diff --git a/script/annotate-models b/script/annotate-models
new file mode 100755
index 000000000..b6e01c010
--- /dev/null
+++ b/script/annotate-models
@@ -0,0 +1,5 @@
+#!/bin/bash
+#
+# annotates the models in app/ with schema information
+
+bundle exec annotate -m -p before --exclude tests,fixtures