LimeSurvey: 2.05 c1483efa

Diff Back to Repository
Author Committer Branch Timestamp Parent
mdekker mdekker 2.05 2013-09-03 15:16 2.05 c503db43
Changeset

Merge branch '2.05' of https://github.com/LimeSurvey/LimeSurvey.git into 2.05

Conflicts:
application/models/Token.php
mod - application/models/Dynamic.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Token.php Diff File