[wemux/el6: 4/4] Merge branch 'master' into el6

[Christopher Meng]

commit 3223e3cfe546728c11592b01725664bc4a0602c2
Merge: 9c8e313 ff82721
Author: Christopher Meng <i at cicku.me>
Date:   Fri Mar 14 09:05:24 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	wemux.spec

 .gitignore |    1 +
 sources    |    2 +-
 wemux.spec |   55 ++++++++++++++++++++++++++-----------------------------
 3 files changed, 28 insertions(+), 30 deletions(-)
---