Merge branch 'master' of git+ssh://repo.or.cz/srv/git/fbsplash
commit2c1fb6087d5608c4c1e60694c9637c7c238e128b
authorMichał Januszewski <spock@gentoo.org>
Sat, 9 Oct 2010 19:10:16 +0000 (9 21:10 +0200)
committerMichał Januszewski <spock@gentoo.org>
Sat, 9 Oct 2010 19:10:16 +0000 (9 21:10 +0200)
treeae2ebea24f22316a92e28d52bca6018b153dd88d
parent7077483874a842c607d6e877696891ba4d5f1dd7
parent1f3425e492396d8435e864502881c6bcf3c94050
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/fbsplash