[fedora-cookbook] master: Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/fedora-cookbook (fbf3618)

[immanetize at fedoraproject.org]

Repository : http://git.fedorahosted.org/cgit/docs/fedora-cookbook.git

On branch  : master

>---------------------------------------------------------------

commit fbf3618a682d16f0e1b1ab112d75c77ec75eee0b
Merge: 9431973 1d8528f
Author: Pete Travis <immanetize at fedoraproject.org>
Date:   Sun May 18 02:02:15 2014 -0600

    Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/fedora-cookbook



>---------------------------------------------------------------