Date: | 2012-05-15 15:48:56 (12 years 7 months ago) |
---|---|
Author: | Thomas Keller |
Branch: | develop |
Commit: | 01febe141152dfb2334d98d9ddf9b24bd90dd07d |
Parents: |
231dfaa8a6e4bf83db1f80f3d88741911c272ed4 839444cc8a2548a68135db76ed7a9c56992a1d3c |
Message: | Merge branch 'release-1.3' into develop |