Merge branch 'devel' into settings
authorMarek Marecki <marekjm@taistelu.com>
Thu, 8 Aug 2013 17:37:09 +0000 (19:37 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Thu, 8 Aug 2013 17:37:09 +0000 (19:37 +0200)
commitd0a6003100f708f7169a2cd8e6f8a8d916a9c0b4
tree47e45c97ea57516ad8b9788c43de72db929aceca
parentb7a15036150eeec777cb440f13885d7d34d8e273
parent2d4f6eeba2ecb432d44e995786de5eab9f941000
Merge branch 'devel' into settings