[RackTables/el6: 39/39] Merge branch 'master' into el6

[Colin Coe]

commit 173e2731c42a69f97168c9126e4438a1642827b0
Merge: cc9df40 5347e79
Author: Colin Coe <colin.coe at gmail.com>
Date:   Mon Dec 29 11:06:02 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	RackTables.spec
    	sources

 .gitignore      |    3 ++-
 RackTables.spec |   17 ++++++++++++++++-
 sources         |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
---