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

[mystro256]

commit 4013d826a02e6f9280ec45f4c813a129a4864407
Merge: fb6a613 c239e24
Author: alexjnewt at hotmail.com <alexjnewt at hotmail.com>
Date:   Wed Nov 12 13:54:16 2014 -0500

    Merge branch 'master' into epel7

 wxGTK3.spec |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)
---