Merge remote-tracking branch 'spjoe/master' (closes PR #1921)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 8 Dec 2013 15:33:34 +0000 (16:33 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 8 Dec 2013 15:33:34 +0000 (16:33 +0100)
commit5adb81894724a05f2273828d74c4cff86a7bdab6
tree7370152ba56cc51d67ce90e34c3b01df976c4eaa
parent22686b91f0883e3686d039a5ddc104abd6cf3b26
parent52defb0c9bbf6716b303a06ce2cca7ffee7d8682
Merge remote-tracking branch 'spjoe/master' (closes PR #1921)