Merge branch 'master' of git://github.com/gammons/discourse
Merge branch 'clean_up_gemfile' of git://github.com/johnmcdowall/discourse
Use define_method instead of eval-ing a string

It avoids the need for escaping the interpolations.
fix user listing and search on non-US locale
Merge branch 'define_method' of git://github.com/blom/discourse
Merge pull request #104 from kubabrecka/fix_non_us_locale

fix user listing and search on non-US locale
add to_date so its more explicit
Merge pull request #98 from blom/define_method

Use define_method instead of eval-ing a string
Prevent click from being trapped in the editor field
added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false
Merge branch 'master' of github.com:discourse/discourse
Merge pull request #108 from tms/searchbox-key-interceptions

Prevent click from being trapped in the editor field
rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default.
Merge branch 'master' of github.com:discourse/discourse
Reduce z-index on reply tab so it's below the share box
Merge pull request #110 from tms/share-box-zindex

Reduce z-index on reply tab so it's below the share box
not required there, if anything should go in the initializer
update markdown converter from showdown source, handles trailing parens etc.
Merge branch 'master' of github.com:discourse/discourse
Disable reply button on archived/closed topics