commit | 69ff798c6dc7c1dfaab3717a1a401b56f8c4e997 | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 21:39:18 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Thu Feb 02 21:39:18 2012 +0200 |
tree | daed2e56b08396deee820612d377a21c117f6d00 | |
parent | 247e122495af3bb5fcd144df89efe9433ca1e31f [diff] | |
parent | b211adee89f5fd2192051e9c0826146bd150f469 [diff] |
Merge remote-tracking branch 'upstream/develop' into develop-image-lib