Merge remote-tracking branch 'upstream/master'
authorThomas Willingham <founder@kakste.com>
Wed, 4 Apr 2012 17:09:29 +0000 (18:09 +0100)
committerThomas Willingham <founder@kakste.com>
Wed, 4 Apr 2012 17:09:29 +0000 (18:09 +0100)

Trivial merge