Date: | 2011-11-30 11:09:35 (13 years 22 days ago) |
---|---|
Author: | Thomas Keller |
Branch: | develop, release-1.3 |
Commit: | 7267fada64becac9215d065a41a889dac6987e61 |
Parents: |
b39fe8595c6946b06e414c852919efc6973dbe29 bfc568967b265a01a256197d6e33c82710f9d21f |
Message: | Merge branch 'release-1.2' into develop |