Merge branch 'f15' into f14

Browse source

Conflicts:
	.gitignore
	sources
	wordpress.spec

...

This commit is contained in:

Matěj Cepl 2011-07-05 11:04:43 +02:00

parent 9f239cfc81 4214abd909

commit e153eb0f94

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available