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, 14 insertions, 0 deletions

diff --git a/public/javascripts/admin.js b/public/javascripts/admin.js
new file mode 100644
index 000000000..21725ded4
--- /dev/null
+++ b/public/javascripts/admin.js
@@ -0,0 +1,14 @@
+// Generated by CoffeeScript 1.3.1
+(function() {
+
+  (function($) {
+    $(document).ready(function() {
+      return $('.locales a:first').tab('show');
+    });
+    return $('.toggle-hidden').live('click', function() {
+      $(this).parents('td').find('div:hidden').show();
+      return false;
+    });
+  })(jQuery);
+
+}).call(this);