Merge branch 'adam' into jm2/devel
commitd1f8c9296bfc3429a08c9580880a8f142ff0bd3e
authorJan Mandel <jan.mandel@gmail.com`>
Sat, 18 Feb 2017 17:41:11 +0000 (18 10:41 -0700)
committerJan Mandel <jan.mandel@gmail.com`>
Sat, 18 Feb 2017 17:41:11 +0000 (18 10:41 -0700)
tree86c39da844a2bc953c624e0f3305bf59cf7e0663
parentf45b61ca14fc808c286c2f6c0b650570516cd49d
parent60a097f77a803ea8e174ffeb161ece1de5a2c07a
Merge branch 'adam' into jm2/devel