Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
authorOlexa Bilaniuk <obilaniu@gmail.com>
Tue, 20 Jan 2015 18:11:09 +0000 (13:11 -0500)
committerOlexa Bilaniuk <obilaniu@gmail.com>
Tue, 20 Jan 2015 18:11:09 +0000 (13:11 -0500)
commit045f8294bbcfbbaabe6055de4d8afa5a8bc55639
tree361e4ed653ec36143b906d5a7e80290d993b1417
parent02124f19e6a445b0712495f69f829afb849214fe
parent95ecdc3af965cd34412ebc6c39112e8b765326da
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho