[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24

[Leigh Scott]

commit 27fa7104311785b23d7d56a36727f21b7f7a0883
Merge: a0166dc 91ebfb5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 27 10:55:18 2016 +0100

    Merge branch 'master' into f24

 xorg-x11-drv-nvidia.spec | 1 -
 1 file changed, 1 deletion(-)
---