Fixed #276. Merge branch 'wernsaar-develop' into bulldozer
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 9 Aug 2013 02:49:44 +0000 (10:49 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Fri, 9 Aug 2013 02:50:06 +0000 (10:50 +0800)
commit49faee1a51f9247dda24975aea6c262ac365d63b
tree37c379533a135b8b4415799b19bc3e9edf00f874
parent2905042c6a8cd3bc5cd76bb580122fe67b897dfa
parentc0159d44a34b9818444415466f77b9092dc6a9f5
Fixed #276. Merge branch 'wernsaar-develop' into bulldozer