56/2cc00ca57d00a22d56e61c5da307864e5db2f9 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9edd29d004d2ba49a3ac5ac36b9e5e3dd68ad4c7
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jun 27 15:36:12 2013 +0200
Notes added by 'git notes add'
diff --git a/56/2cc00ca57d00a22d56e61c5da307864e5db2f9
b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9
index 0d2043e..1fe56ce 100644
--- a/56/2cc00ca57d00a22d56e61c5da307864e5db2f9
+++ b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9
@@ -1 +1 @@
-merged as: e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d
+prefer: af4b6c94c68b5f67b931cde8d0acda6ec8b288bb
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
