Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 28 Nov 2014 09:44:00 +0000 (18:44 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 28 Nov 2014 09:44:02 +0000 (18:44 +0900)
commit6d0e27c0cb75a45de2bf640392d10053584a4cc3
treebf862b178e6c92f3e38c5c35f635fbdb9e5357ba
parentaafa0a37ad82464dca3cf7d38013aa17d2e5b792
parentbc23529da995f1f96e0e5a1c9a64b4ff62c8d2bb
Merge branch 'devel/home/master'

Change-Id: I52d0454b055feca8c8c2c9d0fda307c16eda66cd
src/slave_life.c