Lock iconv to version 0.1 as later ones need ruby 1.9
Preload sender/recipient details for messages
Reimplement User#is_friends_with? in a non-insane way
Improve selection logic in DiaryEntry#rss
Optimise database reads in DiaryEntry#list
Avoid reading nodes twice in WayController#full
Use changeset and user caches in Changeset#download
Force translations to be preloaded during startup
Wait until after rails has initialise I18n to preload the resources
Mark CORS responses as uncacheable
merge from upstream/master