Merge branch 'master' into windows
commit4396c38df0cd6fd62daecbc5fd31be7cd4789515
authorbmss <bruno.santos@bluecape.com.pt>
Wed, 4 Apr 2012 22:14:40 +0000 (4 23:14 +0100)
committerbmss <bruno.santos@bluecape.com.pt>
Wed, 4 Apr 2012 22:14:40 +0000 (4 23:14 +0100)
treec8a4ed3479003536ad541c2850b7144c96496d82
parentd21ac495f6656ae7015a3540018441ffe72149c3
parentc8fbc84531ffcdd6216f9ab7bf3f2981a7b6e3e9
Merge branch 'master' into windows