Merge branch 'devel' of mmka:unres into devel
authorAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 13:39:58 +0000 (14:39 +0100)
committerAdam Sieradzan <adasko@piasek2.(none)>
Tue, 5 Nov 2013 13:39:58 +0000 (14:39 +0100)

Trivial merge