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

[Jared Smith]

commit b27a85b05d0b95775103647dd13586ec5a87c431
Merge: 23b0cdf eb048a2
Author: Jared K. Smith <jaredsmith at jaredsmith.net>
Date:   Fri Oct 17 16:44:53 2014 -0400

    Merge branch 'master' into el6

 pjproject.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---