Merge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline
authorJohan Sørensen <johan@johansorensen.com>
Thu, 20 May 2010 08:35:37 +0000 (10:35 +0200)
committerJohan Sørensen <johan@johansorensen.com>
Thu, 20 May 2010 08:35:37 +0000 (10:35 +0200)
commit673206088ce35f5edf91755bd2b6682a0d4c2465
treebad64de008360900762bce495389390b0e27491f
parenta2fb40abbd414e7bcd3c732afcc7a4bf4e5170ac
parentc0909256525235eae9fc04b4daaf010c8e9cd778
Merge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  A little clean up of the contact information
  Make the support email address configurable
app/views/site/contact.html.erb