| commit | 4d1f568db2beb312a23c0180db8d90a869bdbd3d | [log] [download] |
|---|---|---|
| author | Florian Nücke <florian@nuecke.de> | Sat Dec 28 18:55:55 2013 +0100 |
| committer | Florian Nücke <florian@nuecke.de> | Sat Dec 28 18:55:55 2013 +0100 |
| tree | 1dd5f1227b8946cdf0fcc8120f874003607f992c | |
| parent | fbb1fd748b1a16d7e6af3c474885c0227cd329a5 [diff] | |
| parent | 53ae80914cfddc346e2829a4d0ba4de9359d0c85 [diff] |
Merge branch '1.1' of cil.li:oc into 1.1