[SCM] blender/master.cycles: Merge branch 'master' into master.cycles

[mfv-guest at users.alioth.debian.org]

Merge tag 'upstream/2.63a'
Imported Upstream version 2.63a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.cycles
X-Git-Reftype: branch
X-Git-Oldrev: 86497d80cfa4bd4cf91be9591bbdad41e33431ee
X-Git-Newrev: ad6722b1b1270af7e3dc8469550c76b087fc23a7

The following commit has been merged in the master.cycles branch:
commit ad6722b1b1270af7e3dc8469550c76b087fc23a7
Merge: 86497d80cfa4bd4cf91be9591bbdad41e33431ee f034eabee05b011b94f4d44e81890de20db773ec
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sun May 13 15:47:22 2012 +0200

    Merge branch 'master' into master.cycles
    
    Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>

diff --combined debian/changelog
index 2b57a3e,63ab0e9..f8e3007
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- blender (2.63-1~cycles) UNRELEASED; urgency=low
++blender (2.63a-1~cycles) UNRELEASED; urgency=low
 +
 +  * debian/: Cycles support added (Closes: #658075)
 +
-  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Sat, 05 May 2012 18:05:04 +0200
++ -- Matteo F. Vescovi <mfv.debian at gmail.com>  Sun, 13 May 2012 15:45:05 +0200
++
+ blender (2.63a-1) unstable; urgency=low
+ 
+   * New upstream bugfix release
+     + debian/patches/: re-worked since source code changed
+ 
+  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Sat, 12 May 2012 20:02:22 +0200
  
  blender (2.63-1) unstable; urgency=low
  

-- 
blender packaging