Merge branch 'master' into python
authorCheng Zhao <zcbenz@gmail.com>
Fri, 21 Jun 2013 15:04:39 +0000 (23:04 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 21 Jun 2013 23:55:51 +0000 (07:55 +0800)
commit6bb3f1bba8a3ae60bbd2c2703571c6dee9e04c60
treee61c83cb79737aab61237a3e95f3014d42924cfe
parent1eb521d32a842dc2a7421043419bf95d9e9aae81
parentf26db5c7a1c6328549d1bb884b051f03b1786494
Merge branch 'master' into python

Conflicts:
script/update
atom.gyp
script/update