| commit | 7850cb3eb456c842e1ffa8bcd0bfa5e4b2c49ecb | [log] [tgz] |
|---|---|---|
| author | buyingyi <buyingyi@gmail.com> | Fri May 24 14:12:41 2013 -0700 |
| committer | buyingyi <buyingyi@gmail.com> | Fri May 24 14:12:41 2013 -0700 |
| tree | 5deb64b1a1b12e05a47ad0a101aa8b2bd6e9ef47 | |
| parent | f4e0d484b15f4264aef84017ff674655efe20854 [diff] | |
| parent | a8f1f536abfecdb19fc7fe00a14dc1c38f4f3f11 [diff] |
Merge branch 'yingyi/asterix_beta_fix'