Merge remote-tracking branch 'upstream/master' 255/head
authorfededim <fededim@gmail.com>
Thu, 28 Aug 2014 15:51:52 +0000 (17:51 +0200)
committerfededim <fededim@gmail.com>
Thu, 28 Aug 2014 15:51:52 +0000 (17:51 +0200)
commit865c06eafe59d8c6d156306d6c1dde0208fa74eb
tree800ba66bf6f1b2f55d6b1895efed2f42696cfe9d
parent85a429915a1548a51a9249e4b03a61dc85de6e65
parentd6560317c4504ecce1b1ebac120152ae3372d9e7
Merge remote-tracking branch 'upstream/master'

Updated to latest trunk