Merge branch 'contrib' into 'master'
authorRoland Haeder <roland@mxchange.org>
Mon, 3 Feb 2014 19:20:11 +0000 (20:20 +0100)
committerRoland Haeder <roland@mxchange.org>
Mon, 3 Feb 2014 19:20:11 +0000 (20:20 +0100)
commit2e0774b25a6a817442d8db47ba8210dbc3bded7a
tree287745f664a4887b93e8304a23ba48c6af7c58de
parenta2827d9429cea1d640c7b96ba5e9d9b484ae6fd5
parent796214a8b9b44e08094dc0fe2df8e37b9ef847f6
Merge branch 'contrib' into 'master'

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
.gitattributes
.gitignore
.gitattributes
.gitignore