Merge branch 'PHP-5.5'

* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
	UPGRADING

diff --cc UPGRADING
index f7eda53519ca13191250ba9b474c9a9767537559,ee1ff67c856296dfe6698aeae7e175ac89e4ef5e..89107abbb107a73597969a963d638adc2f33c2d1
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -68,6 -304,25 +68,28 @@@ PHP X.Y UPGRADE NOTE
  9. New Global Constants
  ========================================
  
++<<<<<<< HEAD
++=======
+ - mysqli:
+   - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
+ 
+ - cURL:
+   - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
+ 
+ - GD
+   - Added constants for imageflip:
+     . IMG_FLIP_HORIZONTAL
+       . IMG_FLIP_VERTICAL
+     . IMG_FLIP_BOTH
+   - Added constants for imagecrop
+     . IMG_CROP_DEFAULT
+     . IMG_CROP_TRANSPARENT
+     . IMG_CROP_BLACK
+     . IMG_CROP_WHITE
+     . IMG_CROP_SIDES
+     . IMG_CROP_THRESHOLD
+ 
++>>>>>>> PHP-5.5
  ========================================
  10. Changes to INI File Handling
  ========================================

diff --cc ext/gd/config.w32
Simple merge