merge: branch 'lr/tap-tests' (bgo #749375)
authorLubomir Rintel <lkundrak@v3.sk>
Tue, 26 May 2015 11:28:26 +0000 (13:28 +0200)
committerLubomir Rintel <lkundrak@v3.sk>
Tue, 26 May 2015 11:52:54 +0000 (13:52 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=749375


Trivial merge