Date: | 2011-12-01 18:28:39 (13 years 20 days ago) |
---|---|
Author: | Thomas Keller |
Branch: | develop, release-1.3 |
Commit: | 57f314badb01610f671ea488700ed6fbb82508c5 |
Parents: |
7267fada64becac9215d065a41a889dac6987e61 6a44af34e1805b353b0dcdee4f66f60cbcf9ac06 |
Message: | Merge branch 'release-1.2' into develop |