diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-09-25 02:30:46 +0800 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-09-25 02:31:59 +0800 |
| commit | 4636f560908fa50256c84dfb0977eb380adb8d69 (patch) | |
| tree | 4b7f618498c87ae98c62cefc21e8f00fb709238b | |
| parent | 8c34ed7e3bc626fee51b5c07dcd38f8da6f42dd6 (diff) | |
| parent | 40713647e7e66d8f1d893618037e00c09bdeb99d (diff) | |
Merge commit 'v2.1' into stable-2.x
v2.1 is identical to 8c34ed7e3bc626fee51b5c07dcd38f8da6f42dd6 which was
HEAD at the time of the 2.1 release, but with the top 2 commits in
reverse order.
0 files changed, 0 insertions, 0 deletions