[SCM] blender/master.jessie-bpo: Merge branch 'master' into master.jessie-bpo

[mfv at users.alioth.debian.org]

The following commit has been merged in the master.jessie-bpo branch:
commit f631f77222e081782f98b44336c7525cf698b6b6
Merge: 851e9388b2102d97ec1876e2a43653d9d9025ec8 74c4215c0295a15114540f017dec8897f6b11e92
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Thu Jul 9 16:43:06 2015 +0200

    Merge branch 'master' into master.jessie-bpo
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 46f6b81,8d733a8..0cffbf4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ blender (2.74+dfsg0-3) unstable; urgency=medium
+ 
+   * debian/rules: NDOF parameter added (Closes: #784796)
+   * debian/patches/: patchset updated
+     - 0008-blender_desktop.patch added
+ 
+  -- Matteo F. Vescovi <mfv at debian.org>  Thu, 02 Jul 2015 22:33:51 +0200
+ 
 +blender (2.74+dfsg0-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Alessio Treglia <alessio at debian.org>  Tue, 23 Jun 2015 09:03:07 +0100
 +
  blender (2.74+dfsg0-2) unstable; urgency=medium
  
    * Upload to unstable (Closes: #783838)

-- 
blender packaging