Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 8 Jun 2011 20:33:43 +0000 (22:33 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 8 Jun 2011 20:33:43 +0000 (22:33 +0200)
commitbb10e5bef7ae062424b4c334a73c4ce988e37ccf
tree367aa2ad51d67faa02c064b18bbfdbc59d13001b
parent82e64b1f122c1d6bef7099e423b9ceba14722f10
parentd07713d0b0696528927e720e957ac4d049e3f46f
Merge remote-tracking branch 'gitorious/master'