tree 4f7d40627860ffa22b2b5690268966facec57b07
parent 0e218bbafae0aa3afe796889f1b58e038e881172
parent e2263b722c1955fdfc5ab7e9213a2a82d418b820
author Max Klyus <xmaruto@gmail.com> 1462355923 -0700
committer Max Klyus <xmaruto@gmail.com> 1462355923 -0700

Merge remote-tracking branch 'upstream/master'

Conflicts:
	xos/core/xoslib/static/js/vendor/ngXosVendor.js