[SCM] blender/master: Merge tag 'upstream/2.69+git20140225.cef73d54'

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

Imported Upstream version 2.69+git20140225.cef73d54
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c4a4944254bd421d2366591a299c8bbe8aeb9e6a
X-Git-Newrev: b26c16d3734f0b9d914600bc6abd598bfa3032d7

The following commit has been merged in the master branch:
commit ccd182010cd046e57b154d0745e7b8f2ca8102e5
Merge: c4a4944254bd421d2366591a299c8bbe8aeb9e6a 32ccfc33914336765cd6d1c1c84414bed342afdf
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Wed Feb 26 12:23:00 2014 +0100

    Merge tag 'upstream/2.69+git20140225.cef73d54'
    
    Upstream version 2.69+git20140225.cef73d54
    
    # gpg: Signature made Wed Feb 26 12:22:58 2014 CET using RSA key ID BF02576C
    # gpg: Good signature from "Matteo F. Vescovi <mfvescovi at gmail.com>"
    # gpg:                 aka "Matteo F. Vescovi <mfv.debian at gmail.com>"


-- 
blender packaging