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)
commite65ed372ee84b1f634ec24002fb7bfd7d48fd7e7
treeb56c3f4dae40c8efab7ddf177c7ae9475d7cf16e
parent7f8c963b4dbcc1e57e97e2637ad5a639594319fa
parent8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9
Merge "Merge branch 'master' into merge-master-arno" into stable/arno