Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 0 insertions, 33 deletions

diff --git a/vendor/gems/json-1.5.1/README-json-jruby.markdown b/vendor/gems/json-1.5.1/README-json-jruby.markdown
deleted file mode 100644
index 13368378d..000000000
--- a/vendor/gems/json-1.5.1/README-json-jruby.markdown
+++ /dev/null
@@ -1,33 +0,0 @@
-JSON-JRuby
-==========
-
-JSON-JRuby is a port of Florian Frank's native
-[`json` library](http://json.rubyforge.org/) to JRuby.
-It aims to be a perfect drop-in replacement for `json_pure`.
-
-
-Development version
-===================
-
-The latest version is available from the
-[Git repository](http://github.com/mernen/json-jruby/tree):
-
-    git clone git://github.com/mernen/json-jruby.git
-
-
-Compiling
-=========
-
-You'll need JRuby version 1.2 or greater to build JSON-JRuby.
-Its path must be set on the `jruby.dir` property of
-`nbproject/project.properties` (defaults to `../jruby`).
-
-Additionally, you'll need [Ant](http://ant.apache.org/), and
-[Ragel](http://www.cs.queensu.ca/~thurston/ragel/) 6.4 or greater.
-
-Then, from the folder where the sources are located, type:
-
-    ant clean jar
-
-to clean any leftovers from previous builds and generate the `.jar` files.
-To generate a RubyGem, specify the `gem` action rather than `jar`.