Code

Merged branch 'upstream'.
authorSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 18:05:59 +0000 (20:05 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 25 Apr 2014 18:05:59 +0000 (20:05 +0200)

Trivial merge