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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-07-19 16:09:02 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:35:44 +0200
commit	b0e3fa41f9db85555d733684a1731d4c7e01ffc0 (patch)
tree	95e77e2d12ac90eb8989e61c9f76bca43fe93865
parent	33f91ac881ea13578267614920066f280b041baa (diff)
parent	4224a3396cefd371328e25631a130f44598ecd9b (diff)
parent	d35a99db3cfc6a13fc36143c26e2d1a95a7ea391 (diff)
parent	fcf62b49c0d37a7b31af23e8c0a29087125da03a (diff)
parent	9720a92e9c862560bdeced5931550e6d0f60059c (diff)
parent	5d5d4aee838d02c8d6ee119d2325d8a39f5455c5 (diff)
parent	31bfaf0d23521af88c5110ebdb974c0963b67f03 (diff)
parent	3b904d9d5ea7e0679c900539bdc099ee6e6221c3 (diff)
parent	2a77fa44f3b2ccf8bf070e7d7350c801fa560d1d (diff)
parent	81b896e98847311537011e239bf0b7d287131965 (diff)
parent	7bf7e8dcafe955b9cacda7d043f75359ce811696 (diff)
parent	8ae3b89540c0a5044126c59776642c898ce6ef50 (diff)
parent	1d9d25cd2960076ede653de755c350e63216e3c5 (diff)
parent	32c76a4434c49e687c0a6e955f521586f9c75be5 (diff)
parent	1df0fe034e945bd140768d563e69417e623f3230 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	8e1312d5b24cafdeef12d588b5f91a4f691bd17d (diff)
parent	2a1e0645f33c2501c6f38309297ef870951ecddf (diff)
parent	4a607556ce44e451bae7292bdb99d7ee9b67fd25 (diff)

merged tag ooo/DEV300_m85ooo/DEV300_m85