Merge branch 'master' into girocco
commit2b2b8095f05b30721b61dc8162a424dc7e485ef2
authorKyle J. McKay <mackyle@gmail.com>
Wed, 23 Jul 2014 09:42:47 +0000 (23 02:42 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 23 Jul 2014 09:42:47 +0000 (23 02:42 -0700)
tree64ec1f61b54cb2e6ecd8ed3deceb05a59c576a79
parent0b3dd8a684f8f76a07dc14ef20ab516bf44fb142
parent2c21922ad1795e1d305dac6bdb977f2e50eb809e
Merge branch 'master' into girocco

Conflicts:
hg-fast-export.py
hg-fast-export.sh
hg-fast-export.py
hg-fast-export.sh