tree f7f8d463e1e50796d7b17716e1e0e0979536540b
parent 04478e761481faeb6342ea990b92113726ef2fc6
parent 24bbc1b6c2faa178add5c1acce631ed5b74f5f75
author buyingyi <buyingyi@gmail.com> 1368562999 -0700
committer buyingyi <buyingyi@gmail.com> 1368562999 -0700

Merge branch 'yingyi/asterix_beta_fix'