Merge branch 'adasko' of mmka:unres into adasko
authorAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 07:15:34 +0000 (08:15 +0100)
committerAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 07:15:34 +0000 (08:15 +0100)

Trivial merge