Merge remote-tracking branch 'origin/master'
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Thu, 23 Apr 2015 15:59:39 +0000 (17:59 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Thu, 23 Apr 2015 15:59:39 +0000 (17:59 +0200)
commitf36dd277a2e71e99624fe26365757242d56259c0
tree1d5dfdbf6c0425f2573a7f88e3581ac44f45203d
parent0d7448dabc981716d277a5afac22fabc127bacca
parent89807ed453e27893dea5ac73ee2c6b4f8dd15afb
Merge remote-tracking branch 'origin/master'
st.c