Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jari Matilainen 2014-09-12 00:00:09 +02:00
commit e61c37a2ad
44 changed files with 92 additions and 92 deletions