Merge branch 'settings' into asacat
authorMarek Marecki <marekjm@taistelu.com>
Thu, 22 Aug 2013 14:19:07 +0000 (16:19 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Thu, 22 Aug 2013 14:19:07 +0000 (16:19 +0200)
commite3cd70a3158788b41c4ed5558b6172345189466b
treeac83a30acc1222d20d5b35d4ac814a5a5eb5f4a1
parent18fb9dcf5d14cd5bef17e72cbb82035961973ed6
parent52c871a4474e084648fdfe7b03a888ce28aa7bbf
Merge branch 'settings' into asacat