LimeSurvey: 2.1 88108069

Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-08-16 04:53:25 2.1 a86bce57
Changeset

Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Question_Objects

Conflicts:
application/controllers/admin/question.php

mod - application/controllers/admin/question.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File