Change-Id: Ibf04d863a2f8b21056533a880073e37a4b79784b
Change-Id: I939f27d8c3feb5a040e3e5427fa73460f2e910da
Change-Id: I939f27d8c3feb5a040e3e5427fa73460f2e910da
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I65d2a916b12c7adaa77f20ed4cf55eb051bcd343
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I96171435fcc7a328fc7ec11be0412081a75a518b
2014//12/16
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ifd309e93fa19edc9ec1244d2092796b0e08a45c7
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Signed-off-by: qjj[merge] <qjj@sxj.com>
Change-Id: Ib8399cb782aa5a1d5ffdf6fe5e15e7349bd90489
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I328a8b27206f421610e98886bfa1d5bcb6e66354
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-manager/pom.xml