Merge branch 'feature/config' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 00:32:11 +0000 (20:32 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 00:32:11 +0000 (20:32 -0400)
commitf0fe8b971b20434e7382a677074358c8754752b6
tree3235640caa4f035f118ac298d83d983335146471
parent185450c5e116d3d614fe5ca717477d4251ca025e
parent8c34fa84770c34586fd0d83c05eafe0de6a85682
Merge branch 'feature/config' into develop