| commit | 60f71be48a6b91cc314908c3c0007f13e9cb2f0a | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Wed Jan 15 17:51:58 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Wed Jan 15 17:51:58 2014 +0200 |
| tree | c7eb0d43c976984303886503781e0fcae0f0949a | |
| parent | 9916bfc126b0d6efa337740b263f123c5367fc55 [diff] | |
| parent | d8b1ad31cf7ee205ddf3cf396b1d1bfa45af49fa [diff] |
Merge changes from develop