[sl/el5: 21/21] Merge branch 'el6' into el5

[Matej Cepl]

commit df345b24716c86df3b01cc4bc864c399c2c3f2e0
Merge: 02bb3f2 3135e8a
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Fri Dec 5 11:26:44 2014 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	sl.spec
    	sources

 .gitignore |    1 +
 sl.spec    |   67 +++++++++++++++++++++++++++++++++++++++++++----------------
 sources    |    2 +-
 3 files changed, 51 insertions(+), 19 deletions(-)
---