| commit | 7e75bf88ccaee5829ac8711fee944182e4dce57f | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 20:59:44 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Fri Jan 27 20:59:44 2012 +0200 |
| tree | c778a84810199b93a9b4335366038fec3ce030d8 | |
| parent | 65571d9d9684573887dc4a481b44f33b13584059 [diff] | |
| parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 [diff] |
Merge remote-tracking branch 'upstream/develop' into develop-issue-128