LimeSurvey: 2.1 51c08965

Diff Back to Repository
Author Committer Branch Timestamp Parent
user16774 user16774 2.1 2012-07-30 13:53:58 2.1 fadc867a
Changeset

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

Conflicts:
application/controllers/admin/export.php
application/controllers/admin/responses.php
application/controllers/survey/index.php
application/helpers/admin/exportresults_helper.php