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)
commitf5a9e806544f8c34fca5bbd15a38134e04b93831
tree6aba8a9ae0945ecda31ab677bd98c3ab350f6c87
parent8d1944473d121f9ca4a5af37e99e216086f3cf0e
parent33164443f90f9547088ba736a62f2b0bc791ea05
Merge branch 'devel' of mmka:unres into devel