Merge branch 'tournaments' v4.10.0
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sun, 3 Nov 2013 08:57:52 +0000 (09:57 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sun, 3 Nov 2013 08:57:52 +0000 (09:57 +0100)

Trivial merge