]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 12:50:07 +0000 (12:50 +0000)
committerLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 12:50:07 +0000 (12:50 +0000)
1  2 
tests/setup.sh

diff --cc tests/setup.sh
Simple merge