[SCM] yafaray-exporter/upstream: Merge remote-tracking branch 'origin/upstream' into upstream

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

Imported Upstream version 0.1.2~beta2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 76509ccfaaa78e50104033596b02c2c1f5ff0da9
X-Git-Newrev: 408e1b459b9c430c3e6227b2ce64c6664a6b8a00

The following commit has been merged in the upstream branch:
commit 408e1b459b9c430c3e6227b2ce64c6664a6b8a00
Merge: c41d28a511622eb5636fa3524a07f52cac781389 76509ccfaaa78e50104033596b02c2c1f5ff0da9
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Jan 2 20:48:45 2012 +0100

    Merge remote-tracking branch 'origin/upstream' into upstream


-- 
yafaray-exporter packaging