[LyX/master] Merge branch 'master' of git.l

2013-05-31 Thread Uwe Stöhr
commit 26910d5ec49395d1372dd5b9259f1bf6ed23de0a Merge: 40a7c11 1e42af6 Author: Uwe Stöhr Date: Fri May 31 14:32:05 2013 +0200 Merge branch 'master' of git.lyx.org:lyx

Re: [LyX/master] Merge branch 'master' of git.l

2013-05-31 Thread Vincent van Ravesteijn
Op 31-5-2013 14:32, Uwe Stöhr schreef: commit 26910d5ec49395d1372dd5b9259f1bf6ed23de0a Merge: 40a7c11 1e42af6 Author: Uwe Stöhr Date: Fri May 31 14:32:05 2013 +0200 Merge branch 'master' of git.lyx.org:lyx Uwe, can you try to avoid these useless merges. You can do this by not using "T