commit 7cfb0b0a15165885d7aa06f7436f3d26bb923b3b Merge: 511ebd0 f055980 Author: Andrew Colin Kissa <andrew at topdog.za.net> Date: Sun Oct 28 10:35:45 2012 +0200 Merge branch 'master' into el5 php-pecl-lzf.spec | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) ---