Merge branch 'master' into stable
commitfb23e32bcb0a62b9d404f89139601341f926c1d9
authorGuy Brand <gb@unistra.fr>
Sun, 8 Dec 2013 17:04:50 +0000 (8 18:04 +0100)
committerGuy Brand <gb@unistra.fr>
Sun, 8 Dec 2013 17:04:50 +0000 (8 18:04 +0100)
tree4d30240af3098ab3bf8b6862b412373f988ab2ea
parent2877053aad7cf3e245eaedfe042ccc4ebfcf273b
parent8c4759c9d38a21eb352498a8035944ee019e7738
Merge branch 'master' into stable