Commit Graph
1 Commits
Author SHA1 Message Date
Christopher Aillon a730a71773 Merge remote-tracking branch 'origin/f15/master'
Conflicts:
	.gitignore
	gsettings-desktop-schemas.spec
	sources
2011-04-03 17:14:14 -07:00