20131203 diary
merge