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, 82 deletions

diff --git a/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log b/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
deleted file mode 100644
index abfc0d4e5..000000000
--- a/vendor/gems/json-1.5.1/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
+++ /dev/null
@@ -1,82 +0,0 @@
-========================== 2009-04-01T16:48:20 CEST ===========================
-Benchmarking on ruby 1.8.6 (2008-08-11 patchlevel 287) [i686-linux].
-Running 'ParserBenchmarkPure' for 1000 iterations/method (compare_time=real)
-===============================================================================
-
-This first run is only for warmup.
-ParserBenchmarkPure#parser:
-                  real             total              user            system 
-sum       37.410897017      37.380000000      37.360000000       0.020000000 
-min        0.032916069       0.030000000       0.030000000       0.000000000 
-std-       0.029058517       0.027934111       0.027951551      -0.000426990 
-mean       0.037410897       0.037380000       0.037360000       0.000020000 
-std+       0.045763277       0.046825889       0.046768449       0.000466990 
-max        0.068524122       0.070000000       0.070000000       0.010000000 
-std        0.008352380       0.009445889       0.009408449       0.000446990 
-std%      22.326062222      25.269901841      25.183215569    2234.948544149 
-harm       0.036161242       0.035525181       0.035515868               nan 
-geo        0.036699193       0.036372385       0.036358664       0.000000000 
-q1         0.033462286       0.030000000       0.030000000       0.000000000 
-med        0.033834100       0.040000000       0.040000000       0.000000000 
-q3         0.036020756       0.040000000       0.040000000       0.000000000 
-                  1000          26.73018       0.037410897
-                 calls         calls/sec         secs/call
-
-    0.06674 -|
-    0.06318 -|*
-    0.05962 -|******
-    0.05606 -|*
-    0.05250 -|
-    0.04894 -|
-    0.04538 -|
-    0.04182 -|*
-    0.03826 -|****
-    0.03470 -|**************************************************
-
-Outliers detected with box plot algo (median=0.03383, iqr=0.00256, factor=3.00):
-high=35 very_high=121
-
-Ljung-Box statistics: q=2505.23586 (alpha=0.05, df=50).
-1.00000 >= 0.95000 => Autocorrelation was detected.
-
-ParserBenchmarkPure#parser:
-                  real             total              user            system 
-sum       37.376162529      37.280000000      37.260000000       0.020000000 
-min        0.032336950       0.030000000       0.030000000       0.000000000 
-std-       0.028895529       0.027756750       0.027774096      -0.000426990 
-mean       0.037376163       0.037280000       0.037260000       0.000020000 
-std+       0.045856796       0.046803250       0.046745904       0.000466990 
-max        0.068592072       0.070000000       0.070000000       0.010000000 
-std        0.008480634       0.009523250       0.009485904       0.000446990 
-std%      22.689953522      25.545198741      25.458680636    2234.948544149 
-harm       0.036080414       0.035400319       0.035391071               nan 
-geo        0.036638902       0.036256656       0.036242979       0.000000000 
-q1         0.033310235       0.030000000       0.030000000       0.000000000 
-med        0.033644676       0.030000000       0.030000000       0.000000000 
-q3         0.036110342       0.040000000       0.040000000       0.000000000 
-                  1000          26.75502       0.037376163
-                 calls         calls/sec         secs/call
-
-    0.06678 -|
-    0.06315 -|*
-    0.05953 -|*******
-    0.05590 -|
-    0.05228 -|
-    0.04865 -|
-    0.04503 -|
-    0.04140 -|**
-    0.03778 -|********
-    0.03415 -|**************************************************
-
-Outliers detected with box plot algo (median=0.03364, iqr=0.00280, factor=3.00):
-high=33 very_high=124
-
-Ljung-Box statistics: q=3251.86614 (alpha=0.05, df=50).
-1.00000 >= 0.95000 => Autocorrelation was detected.
-
-No initial data truncated.
- => System may have been in a steady state from the beginning.
-========================== 2009-04-01T16:49:38 CEST ===========================
-
-Writing measurement data file '/data/scm/json/benchmarks/data/ParserBenchmarkPure#parser.dat'.
-Writing autocorrelation plot file '/data/scm/json/benchmarks/data/ParserBenchmarkPure#parser-autocorrelation.dat'.