vcs.fsf.org Git - fsf-giving-guide.git/commit

author	Reda Lazri <the.red.shortcut@gmail.com>
	Sun, 23 Nov 2014 12:13:37 +0000 (13:13 +0100)
committer	Reda Lazri <the.red.shortcut@gmail.com>
	Sun, 23 Nov 2014 12:13:37 +0000 (13:13 +0100)
commit	01328241fb8b2d67558d0651bdb95da6835d24b8
tree	1e8b1c68ab280569594c6312ad9fa54da99b8ef8	tree \| snapshot (zip tar.gz)
parent	505e39702b013929ad643d0766dc56bfa4c8abb5	commit \| diff
parent	347bca06b1c5cecfcb2dc02f33e28ca440300ba3	commit \| diff

Merge branch 'master' of vcs.fsf.org:fsf-giving-guide

Conflicts:
givingguide.html