commit b2f99b81a2902bf4e231770798e5dc38a212afde Merge: 3bd95a2 c802af6 Author: Troy Dawson <tdawson at redhat.com> Date: Wed Sep 25 08:25:49 2013 -0500 Merge branch 'master' into f20 rubygem-passenger.spec | 50 ++++------------------------------------------- 1 files changed, 5 insertions(+), 45 deletions(-) ---