Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 11:09:22 +0000 (20:09 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 11:09:26 +0000 (20:09 +0900)
Conflicts:
src/event.c

Change-Id: Ifc7b758e4bb9e72fca6a05f1c75d540d0394aa81

1  2 
src/slave_life.c

Simple merge