[php53-mapi/el5: 2/2] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 8ff46c22719135da69aecd7764f443c510438d70
Merge: d379148 1db8fdc
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Feb 11 00:06:50 2013 +0100

    Merge remote branch 'origin/master' into el5

 dead.package |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---