merged tag ooo/OOO330_m12 - libreoffice/core - main, development code repository

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-10-20 16:16:35 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 16:00:53 +0200
commit	b1a7f69a427399669cc63f4cec02d20bc9df9394 (patch)
tree	76918386c5535aa4979d51a2b7d864caafa8cc8b /xmlhelp
parent	5e32d062e0aa2c6cee0aa92797ba6b7da774789d (diff)
parent	c46f11881347616ac54051167de75ed29d67784d (diff)
parent	24f16a97ded3a16c9ed3cbc0497ec00cc6c1076b (diff)
parent	7481720d0155658152ca25e1b62484defea44e7f (diff)
parent	62d7a41f8488af493968d38fe9a7f3a018366a57 (diff)
parent	de86e3362cf4fe6f65a66b01e74f19a8d33e289b (diff)
parent	cd2d88fa74739293706f25f4bc6e46cfea3dfa54 (diff)
parent	bcbacdf60b9c735f9b75cfae5b894fb76cfe77c7 (diff)
parent	00a6a3f6279dcf3b790a17f21bccd3e4cea1fc57 (diff)
parent	00a326249f7bb4e7ded9c743836d9d572d3a9d7f (diff)
parent	ba640a3477213a4d2f179f188fe80029969ef1bb (diff)
parent	e57f65f15eb84c2a0f553ac7801edd15b955188e (diff)
parent	24420c19f0e6ad00cc3d3894180ee01211b710df (diff)
parent	dfc8ac5316dfb47a183cfb637e059da7b8dfb6e0 (diff)
parent	1834c5739669225fd9b5fd77d892207d636762b5 (diff)
parent	0a0bc5ee9809ffe0c0fb80527d9393385ba93708 (diff)
parent	8fa18d9d6955e9b427a746ec650b72216e362b25 (diff)
parent	5c04ffa2a50e3d61cc9beae038e9069713cdefca (diff)
parent	c0be68452261575069d0192bfe722c8b398d9973 (diff)

merged tag ooo/OOO330_m12ooo/OOO330_m12