Merge "Merge branch 'master' into merge-master-arno" into stable/arno
authorTim Rozet <trozet@redhat.com>
Tue, 8 Sep 2015 14:57:39 +0000 (14:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 8 Sep 2015 14:57:39 +0000 (14:57 +0000)

Trivial merge