Merge 0.10 -> trunk
authorWaqas Hussain <waqas20@gmail.com>
Tue, 16 Dec 2014 23:33:54 +0000 (18:33 -0500)
committerWaqas Hussain <waqas20@gmail.com>
Tue, 16 Dec 2014 23:33:54 +0000 (18:33 -0500)
commitc0484a1844a6e69bbebb1f4208cfaf3d81736211
treedb6209606a99e392a0c620b19840244ec47f0f78
parente89b852ba44f843cb37c1908892680580d9f18ff
parentd0f081070a77fa8a745ccbeff22cae06e6a8e09e
Merge 0.10 -> trunk
plugins/mod_admin_telnet.lua
plugins/mod_storage_sql2.lua