[dkms/el5: 2/2] Merge branch 'master' into el5

[Simone Caronni]

commit 83461d97a08c2f17aaf20f44a34c4f1c80d1b2f5
Merge: 013fe84 5dc66dd
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jul 23 18:31:53 2014 +0200

    Merge branch 'master' into el5

 dkms.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---