commit 7934a169a5ddde7862f69aa09a1269aceff329e5 Merge: 4d36d2e 889c623 Author: Claneys Skyne <claneys.skyne at gmail.com> Date: Fri Mar 30 00:56:49 2012 +0200 Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/user-guide ---