Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' into rails-3-develop

Conflicts:
    app/controllers/application_controller.rb
    app/controllers/general_controller.rb
    config/routes.rb

1 files changed, 4 insertions, 0 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 535f893f0..88b107861 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -545,6 +545,10 @@ class ApplicationController < ActionController::Base
         return country
     end
 
+    def alaveteli_git_commit
+      `git log -1 --format="%H"`.strip
+    end
+
     # URL generating functions are needed by all controllers (for redirects),
     # views (for links) and mailers (for use in emails), so include them into
     # all of all.