git.mxchange.org Git - hub.git/commit

author	Roland 'Quix0r' Haeder <roland@mxchange.org>
	Mon, 3 Feb 2014 18:32:56 +0000 (19:32 +0100)
committer	Roland 'Quix0r' Haeder <roland@mxchange.org>
	Mon, 3 Feb 2014 18:32:56 +0000 (19:32 +0100)
commit	dfa91e1b5e2d0a3f68c133b3bec4fcb34e5e9c96
tree	97ca1d28bdfee51c38307bb16598ca6988723e1a	tree \| snapshot
parent	cbf3d1e2e59862323745f7eb9443fdca70131593	commit \| diff
parent	61d2760fac101ab7d766fde01a50c4b349265c12	commit \| diff

Merge branch 'contrib'

Conflicts:
.gitattributes

Signed-off-by: Roland 'Quix0r' Haeder <roland@mxchange.org>