Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS
commit9344351665707d9e2d921c458ee2639423ac8d78
authorLaurent Lalanne <f5soh@free.fr>
Sun, 15 Feb 2015 09:16:28 +0000 (15 10:16 +0100)
committerLaurent Lalanne <f5soh@free.fr>
Sun, 15 Feb 2015 09:16:28 +0000 (15 10:16 +0100)
treeb909562a22efb8393a21d0ad15af6cd5200ff46a
parent9f65db5e0bfaaa9feaf5c5d7789f639e0fc13c66
parentd1b8321ccda4d4f015f582fd6f0c81bb7e9ea1f1
Merge remote-tracking branch 'origin/next' into samguns/zh_CN_GCS