Date: | 2011-11-05 08:47:05 (13 years 2 months ago) |
---|---|
Author: | Thomas Keller |
Branch: | develop, feature.wiki-default-page, release-1.3 |
Commit: | f9629f3f7ba0d30928a9c676adec116664acd446 |
Parents: |
6c9b6b53099232aed46ca03019574a4d93f0eee7 884f50155c29b531a48963f06694f261eca1b52f |
Message: | Merge branch 'release-1.2' into develop |