LimeSurvey: master 03295cad

Author Committer Branch Timestamp Parent
c_schmitz c_schmitz master 2013-03-11 13:47:00 master 9ca37cc9
Changeset

Merge remote-tracking branch 'origin/master'

mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/admin/label_helper.php Diff File
mod - application/models/Label.php 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/el/LC_MESSAGES/el.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/vi/LC_MESSAGES/vi.mo Diff File
mod - scripts/admin/attributeMap.js Diff File
mod - scripts/admin/attributeMapToken.js Diff File