Merge branch 'feature-settings-page' into development
authorLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:34:52 +0000 (16:34 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:34:52 +0000 (16:34 +0100)
commit0236348990b50628602128cddcc0c356de29e0e5
tree50d0c0a40a351f242bcb455ff7bb2a7dbef65f9c
parent637da5cdcd8ff1a9c3a64b42865aba15a790f66e
parent2f99787d71e827e51462d60ef0ac8fce005ab6e0
Merge branch 'feature-settings-page' into development