Merge branch 'kenj-merge'
commitec4cd20a70cd57028e9c3b97f4d446b169a47beb
authorNathan Scott <nathans@redhat.com>
Thu, 9 Jun 2016 23:52:09 +0000 (10 09:52 +1000)
committerNathan Scott <nathans@redhat.com>
Thu, 9 Jun 2016 23:52:09 +0000 (10 09:52 +1000)
tree061c78067a168b6f5704a9e8bb4fd274b50d3061
parentd3364e47aed3f8cba2a83d19431c72153ebb1436
parentf72eb8dbc2302b7999573ee73b0c5c1c243d7421
Merge branch 'kenj-merge'