Merge remote-tracking branch 'upstream/master'
authorMario Nunes <mariogar1979@gmail.com>
Sun, 23 Aug 2015 21:24:09 +0000 (18:24 -0300)
committerMario Nunes <mariogar1979@gmail.com>
Sun, 23 Aug 2015 21:24:09 +0000 (18:24 -0300)
commit2e18ebac0d60eb21455e1f30d3deee45d575c2d9
treecb33ef0fc20f248abaf1089239ec5ac56485f3a8
parent762bbe160b3035135d636809826dfe5766fedf13
parent4e4639a8fb2434ac729c7798f9c96da40bf7171a
Merge remote-tracking branch 'upstream/master'