platform: merge branch 'th/platform-parse-nl-bgo754570'
authorThomas Haller <thaller@redhat.com>
Mon, 2 Nov 2015 12:58:45 +0000 (13:58 +0100)
committerThomas Haller <thaller@redhat.com>
Mon, 2 Nov 2015 12:58:45 +0000 (13:58 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=754570


Trivial merge