songxc/sideNav — pull request #2 by songxc (2013-11-01 07:40:56+00:00)
Title: fix merge config bug. use mix instead.

fix merge config bug. use mix instead.