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

Trivial merge