policy: merge branch 'th/policy-cleanup'
authorThomas Haller <thaller@redhat.com>
Tue, 29 Mar 2016 10:20:15 +0000 (12:20 +0200)
committerThomas Haller <thaller@redhat.com>
Tue, 29 Mar 2016 10:20:15 +0000 (12:20 +0200)

Trivial merge