[teeworlds/f19: 13/13] Merge branch 'master' into f19

[Igor Gnatenko]

commit 9e9aee1ebc440fa5509ed21563fd5e44b74e31ed
Merge: bed85fe 56d1c68
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Mon Nov 24 10:36:43 2014 +0300

    Merge branch 'master' into f19
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
    
    Conflicts:
    	.gitignore
    	sources
    	teeworlds.spec

 .gitignore     |    1 +
 sources        |    2 +-
 teeworlds.spec |   17 +++++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)
---