LimeSurvey: Plugin e02cef0e

Author Committer Branch Timestamp Parent
sammousa sammousa Plugin 2013-01-28 08:40:16 Plugin 0f61fafb
Changeset

Merge branch 'Plugin' of github.com:LimeSurvey/LimeSurvey into Plugin

Conflicts:
application/helpers/PluginSettingsHelper.php

mod - application/helpers/PluginSettingsHelper.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/views/plugins/configure.php Diff File
mod - application/views/plugins/index.php Diff File