diff options
| author | Katze Miau <miaukatzemiau@priveasy.de> | 2011-10-19 09:50:03 (GMT) |
|---|---|---|
| committer | Katze Miau <miaukatzemiau@priveasy.de> | 2011-10-19 09:50:03 (GMT) |
| commit | 5ae967dc38bf6504eaefe525e3d874f4c19b6ec4 (patch) | |
| tree | 25cc3810e36d0b3949c43cd13fea86013573269d /files | |
| parent | ac705f586ef3f7c08b2952e55508e65bba0be168 (diff) | |
| parent | a405107d25aaef0ef4f3cd915bdee1b68830a203 (diff) | |
Merge gitorious.org:+freifunk-jena/freifunk-jena-batman-config/freifunk-jena-batman-config-v2
Conflicts:
Makefile
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions