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)
commit2d33f82339bda8759795452c7e56f5c4ecb31edc
treeb54ee4c1f5dac75e305913d0092d31512b1552e6
parente36ff6d03bd9a9bdf92267ebbf3a798cfe4b6d5d
parentb3de597cfbadf7bf7b1a2770ea1bdc97686e4189
Merge branch 'devel' of mmka:unres into devel