Merge branch 'master' of ssh://repo.or.cz/srv/git/giroccomaster
commit5c2289870e8e1bf9f39ec2ec7999e08d16a7ade7
authorSusan Potter <me@susanpotter.net>
Sun, 12 Sep 2010 02:18:28 +0000 (11 21:18 -0500)
committerSusan Potter <me@susanpotter.net>
Sun, 12 Sep 2010 02:18:28 +0000 (11 21:18 -0500)
tree7b8562ce3cf7a8a1971d7ca463b89a9b9055e93c
parent1ce5d6f4265c56f233d1c1ef64526ad75b0951da
parentd88e52f78f53fcf88938fda3fcbdf495c067de6d
Merge branch 'master' of ssh://repo.or.cz/srv/git/girocco