diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2012-04-17 00:27:33 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2012-04-17 00:27:33 +0200 |
| commit | 35b719f54c96778f571984065579625bc9f15bf5 (patch) | |
| tree | 31d9213243a4c71d41b7cff32751ab4e1a6f99d8 /config_edittemplate | |
| parent | a77a3312f8574734089b68117d032e7551d72c97 (diff) | |
| parent | b2de1b0fa9be3511de3fa1288bac139b077f5a45 (diff) | |
| parent | 1dc28d745d45be6764072af1da0ceda52a0c17a3 (diff) | |
Merge remote-tracking branches 'kepler.SCHWINGE/master' and 'fp/master'