Merge branch 'rrooij-gamekings_fix'
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:21:02 +0000 (02:21 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:21:02 +0000 (02:21 +0800)
commitd055bf91ccab5c25956f3d360c3b79ed86ad44b9
treed23f9f99a2e64d223187e53c6c4f8c26bf1b7c33
parent3ccb0655c1f27953ba00ee3f8bc290ca9bfda7ce
parent0e1b1a011d1772bc1a7069bad8ad71a53798a212
Merge branch 'rrooij-gamekings_fix'