Merge branch 'master' into merge-master-arno 96/1396/1
authorDan Radez <dradez@redhat.com>
Fri, 4 Sep 2015 18:38:56 +0000 (14:38 -0400)
committerDan Radez <dradez@redhat.com>
Fri, 4 Sep 2015 18:43:31 +0000 (14:43 -0400)
commit8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9
tree0970daa3d2c30f93fe6aa40cfbfb63549e5182d6
parentab4950db472c20b57bff533f1f330b5b794aa35b
parent591a1c4327c0793b4a15443f9e72b79ffbeaa226
Merge branch 'master' into merge-master-arno

Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>