Merge remote-tracking branch 'origin/master' into omaster
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 15 Apr 2014 06:11:47 +0000 (08:11 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 15 Apr 2014 06:11:47 +0000 (08:11 +0200)
1  2 
st.c

diff --cc st.c
Simple merge