Merge branch 'master' of git://gitorious.org/copyleft-next/copyleft-next
authorBen Cotton <bcotton@fedoraproject.org>
Wed, 21 Nov 2012 03:48:31 +0000 (22:48 -0500)
committerBen Cotton <bcotton@fedoraproject.org>
Wed, 21 Nov 2012 03:48:31 +0000 (22:48 -0500)
commit15ee754e4f16e56bc033cedd9c356ff88b16416d
treec3601fee724defcf366bcd4f900e732d2e9502d7
parent381886d723691493db67dae3a611e328f08a634c
parentb67fe0eac504186b27821e5aaf5682c7fa6649ab
Merge branch 'master' of git://gitorious.org/copyleft-next/copyleft-next

Conflicts:
license-drafts/ws-supp