[rubygem-passenger/f20: 2/2] Merge branch 'master' into f20

[jorton]

commit 0ac3d9366b55d934024a1409b812b9a5f80e209e
Merge: b2f99b8 299aa93
Author: Joe Orton <jorton at redhat.com>
Date:   Fri Nov 8 11:21:10 2013 +0000

    Merge branch 'master' into f20

 locations.ini          |   13 +++++++++++++
 rubygem-passenger.spec |   17 +++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---