Merge remote-tracking branch 'upstream/master'
authorSasha Goldshtein <goldshtn@gmail.com>
Sun, 7 Feb 2016 19:16:24 +0000 (11:16 -0800)
committerSasha Goldshtein <goldshtn@gmail.com>
Sun, 7 Feb 2016 19:16:24 +0000 (11:16 -0800)
commit5cd2e0bc187e6e8f4fb7ad142f6d9349309bd8b7
treee5095cef8cc8b6ed27897410e26b83461604f551
parentdc9749394e5be3de9018f11dd505f28c9957d600
parent788f18d2b1fbb9e5494598647076a91affb9c9d9
Merge remote-tracking branch 'upstream/master'