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)
commit6297478ce1c3127044dbf1e72194c6ccee14f9ea
tree287745f664a4887b93e8304a23ba48c6af7c58de
parent990637896e9b72d7fa45cfb52f854a8775ab5871
parent97a9568c83236ab65590ce82bf1f85293ac46c1e
Merge branch 'contrib' into 'master'

Signed-off-by: Roland H├Ąder <roland@mxchange.org>
Conflicts:
.gitattributes
.gitignore
.gitattributes
.gitignore