Merge branch 'settings'
authorAntony Chazapis <chazapis@gmail.com>
Fri, 25 Nov 2011 15:16:21 +0000 (17:16 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Fri, 25 Nov 2011 15:16:21 +0000 (17:16 +0200)
commit01a4b23f300a8c3cef625a1c5752354459d8a981
treeb9148b7c8e7366fb9b92c3d001d172f02573a00c
parent618d7e056007a468866f97194c81310fbe137bf6
parentc4af6d0760ba7c746cfe002acdb88619f1b7e30e
Merge branch 'settings'