]> granicus.if.org Git - cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 20:23:30 +0000 (20:23 +0000)
committerLars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 20:23:30 +0000 (20:23 +0000)
1  2 
filters/syntax-highlighting.sh
tests/setup.sh

Simple merge
diff --cc tests/setup.sh
Simple merge