commit | 6b7368f61761d8fd177ab752c6bea829f0ca2ea5 | [log] [tgz] |
---|---|---|
author | Andrey Andreev <narf@bofh.bg> | Fri Feb 10 14:33:28 2012 +0200 |
committer | Andrey Andreev <narf@bofh.bg> | Fri Feb 10 14:33:28 2012 +0200 |
tree | bc801f54de79a714f80ef2a38febe33cb7af9374 | |
parent | 8d7fffc9f0aa49d7bf306060f0676a7b28b7c808 [diff] | |
parent | 16af6afe991381360439135ddb0735dab1280fed [diff] |
Merge remote-tracking branch 'upstream/develop' into develop-image-lib