Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 11 Jan 2012 23:12:55 +0000 (18:12 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 11 Jan 2012 23:12:55 +0000 (18:12 -0500)
1  2 
buildout.cfg

diff --cc buildout.cfg
Simple merge