Merge branch 'master' of ssh://repo.or.cz/srv/git/gsk
commit13dd0deb326afcf3099d6a32290f3c320adda534
authorPatrick Ecker <patrick.ecker@gmail.com>
Tue, 28 Jun 2011 20:42:42 +0000 (28 22:42 +0200)
committerPatrick Ecker <patrick.ecker@gmail.com>
Tue, 28 Jun 2011 20:42:42 +0000 (28 22:42 +0200)
tree7f8dbb22edfcecab4a21accb0a6e465f972f103c
parentccb5d77deee16bb5bc45122793295feb1fb5c219
parent377f200b01d7695beb924ffd0bc9015f320d8bdb
Merge branch 'master' of ssh://repo.or.cz/srv/git/gsk