tree d0f74239beffd603c76bd562833b0764872aaffd
parent 9f1f319a52aa21eafb826e60a79195603758f0b7
parent cf86dbdba144c2710377ca50ccb4ed795221e74e
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