| commit | 320ddaa3d01c9d8ee6832fa25f9273e2588c63dd | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Thu Dec 15 11:03:05 2011 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Thu Dec 15 11:03:05 2011 +0200 |
| tree | 4f3dc65452c6a3903678c283fdebf4128c8c64af | |
| parent | f7aed129051475b4baeeb549a764464560c9dd34 [diff] | |
| parent | ffa86e89fbcaeb8726089e35c3c5ab5b01214b9c [diff] |
Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stable