Merge remote-tracking branch 'upstream/master' into brisk
authorcbalint13 <cristian.balint@gmail.com>
Tue, 28 Apr 2015 03:48:52 +0000 (06:48 +0300)
committercbalint13 <cristian.balint@gmail.com>
Tue, 28 Apr 2015 03:48:52 +0000 (06:48 +0300)
commit0ded2984b8b735b4a159639e6b7c8313203b59ea
treecdf36f926d08c7fb678fec5340752e917b811cd5
parentdee3a4b52800bb6a4eaf67f6e4f82824e8976b09
parent6a5f413f27cb4955e63277f13c055f88a90e633b
Merge remote-tracking branch 'upstream/master' into brisk