tree 4274f3ca8a5beed4a6c559deeb265aef836df47b
parent 1d14ff0b723f85bcb259f2140cd1ce586d27dc0f
parent 60aaba3806926176214894cd58e062b5ee0afe74
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1447789298 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1447789298 -0600

Merge branch 'master' of https://github.com/open-cloud/xos

Conflicts:
	xos/core/models/service.py