2 Commits (d4b57fc1b076ea0373c8215c0da2a244a7caa6a8)

Author	SHA1	Message	Date
ibuler	86cc963673	更换alert我layer	2015-12-30 12:11:39 +08:00
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00