ysqi 86c7f1db9e Merge branch 'astaxie/develop' into environmentVar ...

# Conflicts:
#	config/fake.go
#	config/xml/xml_test.go
#	config/yaml/yaml_test.go

2016-03-10 19:57:16 +08:00

..

xml_test.go

Merge branch 'astaxie/develop' into environmentVar

2016-03-10 19:57:16 +08:00

xml.go

Merge branch 'astaxie/develop' into environmentVar

2016-03-10 19:57:16 +08:00