Merge branch 'master' of vcs.fsf.org:fai-configs
authorJohn Dulaney <jdulaney@fedoraproject.org>
Thu, 24 Dec 2015 17:40:32 +0000 (12:40 -0500)
committerJohn Dulaney <jdulaney@fedoraproject.org>
Thu, 24 Dec 2015 17:40:32 +0000 (12:40 -0500)
commit07c7b1053878012e9be8c19218f71ef14375dd08
tree57e94cafeb57e9b54297a5583a001e578c61bba2
parent78970a68900f633ec601ef63c9d589671fc77ef3
parentf1ae489ad530087e3e93f3fd1224f2c25826c45f
Merge branch 'master' of vcs.fsf.org:fai-configs