[wxGTK3/epel7: 3/3] Merge branch 'master' into epel7

[mystro256]

commit fb6a613e5b3d8c11554b13f7878912e86c53d9a6
Merge: 6ab0ac5 20dbdc1
Author: alexjnewt at hotmail.com <alexjnewt at hotmail.com>
Date:   Tue Nov 4 08:25:43 2014 -0500

    Merge branch 'master' into epel7
    
    Conflicts:
    	wxGTK3-3.0.2-gtkwarnings.patch

 wxGTK3-3.0.2-gtkwarnings.patch |   14 --------------
 wxGTK3.spec                    |    3 ---
 2 files changed, 0 insertions(+), 17 deletions(-)
---