Date: | 2010-12-06 04:44:29 (14 years 16 days ago) |
---|---|
Author: | Thomas Riché |
Branch: | master |
Commit: | ef671763ef65ec70e92bea7a058db0f8fad18dad |
Parents: |
ee85e01f9faff7fc3989dd43d6bba8d1cb660308 4cfd4abad689747e37404b45c6ff7a00312906ae |
Message: | Merge remote branch 'origin/develop' |