| commit | 1c75780da904b2a56c30c693fc3e03d2145614c2 | [log] [tgz] |
|---|---|---|
| author | vlakoff <vlakoff@gmail.com> | Tue Aug 06 20:25:14 2013 +0200 |
| committer | vlakoff <vlakoff@gmail.com> | Wed Aug 07 09:51:13 2013 +0200 |
| tree | d9aaf2756135df57af12001fc4955099c457d628 | |
| parent | c0b55d53004105bca7f7979931d46fd848e21be0 [diff] |
Fix a few more merge conflicts