Merge branch 'contrib'
authorRoland 'Quix0r' Haeder <roland@mxchange.org>
Mon, 3 Feb 2014 18:32:56 +0000 (19:32 +0100)
committerRoland 'Quix0r' Haeder <roland@mxchange.org>
Mon, 3 Feb 2014 18:32:56 +0000 (19:32 +0100)
commitdfa91e1b5e2d0a3f68c133b3bec4fcb34e5e9c96
tree97ca1d28bdfee51c38307bb16598ca6988723e1a
parentcbf3d1e2e59862323745f7eb9443fdca70131593
parent61d2760fac101ab7d766fde01a50c4b349265c12
Merge branch 'contrib'

Conflicts:
.gitattributes

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