Merge branch 'release/0.14' into wdtk

Conflicts:
    app/views/request/show.html.erb

1 files changed, 0 insertions, 14 deletions

diff --git a/public/javascripts/admin.js b/public/javascripts/admin.js
deleted file mode 100644
index 21725ded4..000000000
--- a/public/javascripts/admin.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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);