diff options
| author | François Bobot <francois@bobot.eu> | 2012-12-07 09:35:38 +0100 |
|---|---|---|
| committer | François Bobot <francois@bobot.eu> | 2012-12-07 09:35:38 +0100 |
| commit | ee50792314754c1ed7ef982877165d8b90c1b21d (patch) | |
| tree | 2f07a1f9fe44e088c3a9edaa8d7a45212fc83245 | |
| parent | f46ba71e78054af63b529eb3271952c55beba37e (diff) | |
| parent | 5d0d0b56d1383f1ad4027d8e6dc739c12cacced8 (diff) | |
Merge release branch '1.0.x'
For clarity 1.0.x is always a subset of master even after cherry-picking
0 files changed, 0 insertions, 0 deletions