Merge branch 'master' into martins-merge
commit567c9e32ac3f8a2b173c7a878c9ccebfacc91e54
authorMarko Myllynen <myllynen@redhat.com>
Fri, 20 May 2016 04:00:31 +0000 (20 14:00 +1000)
committerNathan Scott <nathans@redhat.com>
Fri, 20 May 2016 04:00:31 +0000 (20 14:00 +1000)
treee7c0eab9b2f725c9aed42882f6dc92517bde9a02
parenta867c09772c8cfd3d511f54f8c2a3ae7e6fb1a5f
parentddb6582d5568adf68e7b1399defb4b354d834796
Merge branch 'master' into martins-merge