Merge remote-tracking branch 'upstream/master'
authorArmin Novak <anovak@thinstuff.com>
Tue, 6 Aug 2013 09:58:21 +0000 (11:58 +0200)
committerArmin Novak <anovak@thinstuff.com>
Tue, 6 Aug 2013 09:58:21 +0000 (11:58 +0200)

Trivial merge