Merge remote-tracking branch 'origin/master' into omaster
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 28 Oct 2013 18:18:24 +0000 (19:18 +0100)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 28 Oct 2013 18:18:24 +0000 (19:18 +0100)
1  2 
st.c

diff --cc st.c
Simple merge