[pitivi/f21: 3/3] Merge branch 'master' into f21

[Jon Ciesla]

commit 19d997a22f5a4b4bd2ce6e2f03a1c19af9a57443
Merge: 79cf078 fc8dad9
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Nov 26 12:16:14 2014 -0600

    Merge branch 'master' into f21
    
    Conflicts:
    	pitivi.spec

 pitivi.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---