Commits · 671bccc1175df3e3468832392fd30e25adeb83b4 · Balazs / disco

08 Dec, 2015 3 commits
- merging problems... · 671bccc1
  Balazs authored Dec 08, 2015
  
  671bccc1
- Merge branch 'master' of gitlab.switch.ch:Verbaryerba/disco · 4614ec09
  Balazs authored Dec 08, 2015
```
Conflicts:
	README.md
```
  4614ec09
- updated README.md · 525f3628
  Balazs authored Dec 08, 2015
  
  525f3628
20 Nov, 2015 3 commits
- some more descriptions · 88fb6b84
  Balazs authored Nov 20, 2015
  
  88fb6b84
- inserted top paragraph · 8ecc2c21
  Balazs authored Nov 20, 2015
  
  8ecc2c21
- initial release · 2f6a4748
  Balazs authored Nov 20, 2015
  
  2f6a4748