[pjproject/el6: 2/2] Merge branch 'master' into el6

[Jared Smith]

commit 23b0cdfea5a14185af0a3b1d997fd5bd2f8e5817
Merge: 46488df 5d4c9b0
Author: Jared K. Smith <jaredsmith at jaredsmith.net>
Date:   Wed Oct 15 19:55:41 2014 -0400

    Merge branch 'master' into el6

 pjproject.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---