tree 9f1e387159cb7c4439b11d474e093a35157de12e
parent be5dabf88e98075b9bc936bfa7de0f54a21a0482
parent 4895c15e440b85ab8b53c4ff9cd4e715211f778d
author Vincent Driessen <vincent@3rdcloud.com> 1322077052 +0100
committer Vincent Driessen <vincent@3rdcloud.com> 1322077059 +0100

Merge branch 'chad3814-develop' into develop

Thanks, chad3814.