Merge branch '2.4' into blur_border_isolated
authorSeunghoon Park <pclove1@gmail.com>
Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)
committerSeunghoon Park <pclove1@gmail.com>
Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)
commit73389b2b9c42f814ef66118a644d24f9e74402c2
tree028aac14bfc33acd66242e2bd688a40e28d9f538
parent2272a5876972f74684c43f2069c3046bd2888d01
parent452ea4c15faa3ef66990aaa4fb285a4b23e4fbeb
Merge branch '2.4' into blur_border_isolated