[gambas3/f19: 3/3] Merge branch 'master' into f19

[Jon Ciesla]

commit 69428820c0f37a4b8c548f4d4a47be11bac84af2
Merge: 854f32a 018ac41
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Apr 8 12:58:22 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	gambas3.spec

 .gitignore   |    1 +
 gambas3.spec |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---