Merge branch 'DEVEL', updated to 3.1.2

Conflicts:
	php-pecl-imagick.spec

diff --cc php-pecl-imagick.spec
index b76cc7c9f3787a35633225e9f3bee69b76cb68de,f9aa4c4dbf48115deb030ba45bf4286302ccc1d0..c82d92c7752a7b6fadf9c7ae0fe75561d927d01d
--- 1/php-pecl-imagick.spec
--- 2/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@@ -4,14 -4,12 +4,13 @@@
  Summary:      %{modname} - PHP wrapper to the Image Magick Library
  Summary(pl.UTF-8):    %{modname} - PHP-owy wrapper do biblioteki Image Magick
  Name:         %{php_name}-pecl-%{modname}
- # NOTE: 3.1.x in DEVEL branch
- Version:      3.0.1
- Release:      5
 -Version:      3.1.0
 -Release:      0.RC2.1
++Version:      3.1.2
++Release:      1
  License:      PHP 3.01
  Group:                Development/Languages/PHP
 -Source0:      http://pecl.php.net/get/%{modname}-%{version}RC2.tgz
 -# Source0-md5:        de9cca809fb2db61f4cbd9fac4f69314
 +Source0:      http://pecl.php.net/get/%{modname}-%{version}.tgz
- # Source0-md5:        e2167713316639705202cf9b6cb1fdb1
++# Source0-md5:        f2fd71b026debe056e0ec8d76c2ffe94
 +Patch0:               ImageMagick-6.8.patch
  URL:          http://pecl.php.net/package/imagick/
  BuildRequires:        %{php_name}-devel >= 3:5.1.3
  BuildRequires:        ImageMagick-devel >= 1:6.2.4.0