[LuxRender/f20: 7/7] Merge branch 'master' into f20: - Update to 1.3.1

[François Cami]

commit 8d2c961e6e7d56e59c904a802374e5ec30c757f8
Merge: c96be72 0ab20e0
Author: François Cami <fcami at fedoraproject.org>
Date:   Thu Jan 2 13:39:43 2014 +0100

    Merge branch 'master' into f20:
    - Update to 1.3.1

 .gitignore     |    3 +++
 LuxRender.spec |   45 +++++++++++++++++++++++++--------------------
 sources        |    6 +++---
 3 files changed, 31 insertions(+), 23 deletions(-)
---