Do not strip leading and trailing whitespace from raw posts.
convert plain text in composer template to i18n
Split from nl.yml, updated and ran spellcheck

As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.
Split from nl.yml, updated and ran spellcheck
changed links to localhost to clickable ones
Create fr.yml

Add french translation.
Merge pull request #196 from ZogStriP/patch-5

changed links to localhost to clickable ones
Merge pull request #167 from kevinansfield/missing-i18n-image-uploading

Replace plain text in composer template
Split fr.yml into client.fr.yml + server.fr.yml
stop onebox rapid fire
move stylesheet cache into the upload dir so its less crazy to sync across servers
going to start using image_optim in prd for image sizing
Added restricted route to kick out trespassers on user routes
Merge branch 'origin/master'

Conflicts:
	lib/text_sentinel.rb
Using LengthValidator's localized messages for StrippedLengthValidator.
Include /^http… prefix in onebox whitelist URLs regexes to prevent XSS.
basic lightbox support
Updated, removing tabs and whitespaces. Changed 'en' to 'nl'

Sam: could you try this one instead? Forgot to change 'en' to 'nl' Cheers.
Changed quotes

I used " -quotes in the text, which didn't escape properly. Ran it through a YAML linter and it seems to validate.
Sorry for the inconvenience!
Merge pull request #194 from tms/personal-space

Added restricted route to kick out trespassers on user routes