Merge remote-tracking branch 'upstream/master'
authorMartin Fleisz <mfleisz@thinstuff.com>
Mon, 11 Mar 2013 09:11:44 +0000 (10:11 +0100)
committerMartin Fleisz <mfleisz@thinstuff.com>
Mon, 11 Mar 2013 09:11:44 +0000 (10:11 +0100)

Trivial merge