Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorkos <kos@dev3>
Mon, 19 Aug 2013 11:31:13 +0000 (20:31 +0900)
committerkos <kos@dev3>
Mon, 19 Aug 2013 11:31:13 +0000 (20:31 +0900)

Trivial merge