LimeSurvey: master 1a9e71cd

Author Committer Branch Timestamp Parent
Carsten Schmitz Carsten Schmitz master 2010-03-31 02:45:23 master f48ee196
Changeset

dev Fixed a couple merge issues

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8537 b72ed6b6-b9f8-46b5-92b4-906544132732

mod - admin/activate.php Diff File
mod - admin/labels.php Diff File
mod - admin/usercontrol.php Diff File
mod - qanda.php Diff File