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

Trivial merge