| commit | 1172267e615402ff2efdd8a81abe36666a3700ca | [log] [tgz] |
|---|---|---|
| author | Johan Compagner <jcompagner@gmail.com> | Thu Oct 18 13:06:47 2012 +0200 |
| committer | Johan Compagner <jcompagner@gmail.com> | Thu Oct 18 13:06:47 2012 +0200 |
| tree | 7625da5f461d3db90e220d33604c5a0fcfbf0277 | |
| parent | 3a1c130633259e257989dd46ea76e8187be42375 [diff] | |
| parent | 437a711e214f818ca3f2ab0523761995a3e1eab9 [diff] |
Merge branch 'mylocal'