Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus_3.0
authorschon <schon@dev03-server>
Wed, 16 Dec 2015 02:22:45 +0000 (11:22 +0900)
committerschon <schon@dev03-server>
Wed, 16 Dec 2015 02:22:45 +0000 (11:22 +0900)

Trivial merge